Package: ck Version: 0.7.1-6 Followup-For: Bug #1009622 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu jammy ubuntu-patch Control: tags -1 patch
Please find attached an updated patch. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru ck-0.7.1/debian/patches/armhf-with-fp.patch ck-0.7.1/debian/patches/armhf-with-fp.patch --- ck-0.7.1/debian/patches/armhf-with-fp.patch 1969-12-31 16:00:00.000000000 -0800 +++ ck-0.7.1/debian/patches/armhf-with-fp.patch 2022-04-13 08:11:41.000000000 -0700 @@ -0,0 +1,29 @@ +Description: do not hard-code CPU target based on uname + 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. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/1009622 +Last-Update: 2022-04-13 +Forwarded: no + +Index: ck-0.7.1/configure +=================================================================== +--- ck-0.7.1.orig/configure ++++ ck-0.7.1/configure +@@ -506,14 +506,6 @@ + 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 -Nru ck-0.7.1/debian/patches/series ck-0.7.1/debian/patches/series --- ck-0.7.1/debian/patches/series 2021-10-29 22:05:18.000000000 -0700 +++ ck-0.7.1/debian/patches/series 2022-04-13 08:09:38.000000000 -0700 @@ -1,2 +1,3 @@ debian/0001-cc-builtins.patch debian/0002-disable-sse.patch +armhf-with-fp.patch
