Adding patch from Steve Langasek <steve.langasek@canonical.com> to fix FTBFS on armhf (Closes: #1009622).

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 07:42:39 +01:00
parent f71898f3d6
commit 859abaf8f8
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
2 changed files with 26 additions and 0 deletions

View file

@ -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"}"

View file

@ -1,2 +1,3 @@
debian/0001-cc-builtins.patch debian/0001-cc-builtins.patch
debian/0002-disable-sse.patch debian/0002-disable-sse.patch
debian/0003-ftbfs-armhf.patch