From 67677c515300b9236b9a9d2c7cdeca21eaed95e6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 7 Jul 2022 10:14:24 +0200 Subject: Adding patch from Steve Langasek to fix FTBFS on armhf (Closes: #1009622). Signed-off-by: Daniel Baumann --- debian/patches/debian/0003-ftbfs-armhf.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/patches/debian/0003-ftbfs-armhf.patch 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 +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 -- cgit v1.2.3