summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-07-07 08:14:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-07-07 08:14:30 +0000
commit67677c515300b9236b9a9d2c7cdeca21eaed95e6 (patch)
treea2e17d871d5dc4902fdbf35b9130deeb28715d1e
parentUpdating to standards version 4.6.1. (diff)
downloadck-67677c515300b9236b9a9d2c7cdeca21eaed95e6.tar.xz
ck-67677c515300b9236b9a9d2c7cdeca21eaed95e6.zip
Adding patch from Steve Langasek <steve.langasek@canonical.com> to fix FTBFS on armhf (Closes: #1009622).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/debian/0003-ftbfs-armhf.patch25
-rw-r--r--debian/patches/series1
2 files changed, 26 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"}"
diff --git a/debian/patches/series b/debian/patches/series
index e1dc10d..f1ecda3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
debian/0001-cc-builtins.patch
debian/0002-disable-sse.patch
+debian/0003-ftbfs-armhf.patch