diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-07 08:14:24 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-07 08:14:30 +0000 |
commit | 67677c515300b9236b9a9d2c7cdeca21eaed95e6 (patch) | |
tree | a2e17d871d5dc4902fdbf35b9130deeb28715d1e /debian/patches/debian | |
parent | Updating to standards version 4.6.1. (diff) | |
download | ck-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>
Diffstat (limited to 'debian/patches/debian')
-rw-r--r-- | debian/patches/debian/0003-ftbfs-armhf.patch | 25 |
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"}" |