summaryrefslogtreecommitdiffstats
path: root/debian/patches/debian/0003-ftbfs-armhf.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/debian/0003-ftbfs-armhf.patch')
-rw-r--r--debian/patches/debian/0003-ftbfs-armhf.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/debian/0003-ftbfs-armhf.patch b/debian/patches/debian/0003-ftbfs-armhf.patch
new file mode 100644
index 0000000..568b1e3
--- /dev/null
+++ b/debian/patches/debian/0003-ftbfs-armhf.patch
@@ -0,0 +1,25 @@
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Description: do not hard-code CPU target based on uname (Closes: #1009622).
+ The compiler in Debian correctly targets the right ISA for the
+ architecture. Hard-coding this can result in misbuilds depending on the
+ build machine. Also, armv7-a is the wrong target for armhf now, it should
+ be armv7-a+fp.
+
+diff -Naurp ck.orig/configure ck/configure
+--- ck.orig/configure
++++ ck/configure
+@@ -503,14 +503,6 @@ case $PLATFORM in
+ ENVIRONMENT=64
+ ;;
+ arm|armv6|armv6l|armv7|armv7l)
+- case "$PLATFORM" in
+- "armv6"|"armv6l")
+- CFLAGS="$CFLAGS -march=armv6k";
+- ;;
+- "armv7"|"armv7l")
+- CFLAGS="$CFLAGS -march=armv7-a";
+- ;;
+- esac
+ RTM_ENABLE="CK_MD_RTM_DISABLE"
+ LSE_ENABLE="CK_MD_LSE_DISABLE"
+ MM="${MM:-"CK_MD_RMO"}"