Accepting request 438487 from home:matwey:branches:devel:languages:rust

OBS-URL: https://build.opensuse.org/request/show/438487
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=9

0001-Fix-armv7-autodetection.patch

@@ -0,0 +1,28 @@
+From 10ce90fca20fce776b8bdad504a5e3b915ded99f Mon Sep 17 00:00:00 2001
+From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
+Date: Sun, 30 Oct 2016 11:26:25 +0300
+Subject: [PATCH 1/2] Fix armv7 autodetection
+
+armv7l is armv7 architecture and CFG_CPUTYPE should be armv7 in order to end up
+with armv7-unknown-linux-gnueabihf.mk rather than
+arm-unknown-linux-gnueabihf.mk
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 2bc8c72..d62084c 100755
+--- a/configure
++++ b/configure
+@@ -508,7 +508,7 @@ case $CFG_CPUTYPE in
+         ;;
+ 
+     armv7l)
+-        CFG_CPUTYPE=arm
++        CFG_CPUTYPE=armv7
+         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
+         ;;
+ 
+-- 
+2.1.4
+

0002-Add-armv6l-autodetection.patch

@@ -0,0 +1,29 @@
+From 9b81f3c81b6340221f9713afa9ead070086d7314 Mon Sep 17 00:00:00 2001
+From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
+Date: Sun, 30 Oct 2016 11:27:58 +0300
+Subject: [PATCH 2/2] Add armv6l autodetection
+
+Use arm-unknown-linux-gnueabihf for hardware floating point armv6 variant
+---
+ configure | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure b/configure
+index d62084c..4e62e49 100755
+--- a/configure
++++ b/configure
+@@ -507,6 +507,11 @@ case $CFG_CPUTYPE in
+         CFG_CPUTYPE=arm
+         ;;
+ 
++    armv6l)
++        CFG_CPUTYPE=arm
++        CFG_OSTYPE="${CFG_OSTYPE}eabihf"
++        ;;
++
+     armv7l)
+         CFG_CPUTYPE=armv7
+         CFG_OSTYPE="${CFG_OSTYPE}eabihf"
+-- 
+2.1.4
+

rust.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  2 08:42:44 UTC 2016 - matwey.kornilov@gmail.com
+
+- Add 0001-Fix-armv7-autodetection.patch
+- Add 0002-Add-armv6l-autodetection.patch
+  * fix armv6 and armv7 builds
+
 -------------------------------------------------------------------
 Tue Sep 20 11:46:53 UTC 2016 - kgronlund@suse.com
 

rust.spec

@@ -49,6 +49,10 @@ Source100:      %{name}-rpmlintrc
 Patch1:         0003-Disable-embedding-timestamp-information.patch
 # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs
 Patch2:         add-soname.patch
+# PATCH-FIX-UPSTREAM build armv7 on armv7
+Patch3:         0001-Fix-armv7-autodetection.patch
+# PATCH-FIX-UPSTREAM build arm on armv6
+Patch4:         0002-Add-armv6l-autodetection.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -116,6 +120,8 @@ package.
 %setup -q -n rustc-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 export CPPFLAGS="$RPM_OPT_FLAGS" # eliminate complain from RPMlint