Package: lsp-plugins Version: 1.1.31-1 Followup-For: Bug #1003904 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu jammy ubuntu-patch Control: tags -1 patch
Hi there, Attached is a patch that we have applied in Ubuntu to fix this build failure. It's not suitable as-is for application in Debian, because Debian is using the armv7a profile for both armel and armhf targets, and armel as a Debian architecture doesn't require an FPU - but also, to the best of my knowledge, armv7a is the wrong ISA baseline for the armel architecture in Debian generally, so this may not be the appropriate upstream build profile to use for armel anyway. Thanks for considering, -- 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 lsp-plugins-1.1.31/debian/patches/series lsp-plugins-1.1.31/debian/patches/series --- lsp-plugins-1.1.31/debian/patches/series 2021-12-27 13:29:51.000000000 -0800 +++ lsp-plugins-1.1.31/debian/patches/series 2022-03-09 12:53:52.000000000 -0800 @@ -1 +1,2 @@ cross.patch +use-fp-for-arm.patch diff -Nru lsp-plugins-1.1.31/debian/patches/use-fp-for-arm.patch lsp-plugins-1.1.31/debian/patches/use-fp-for-arm.patch --- lsp-plugins-1.1.31/debian/patches/use-fp-for-arm.patch 1969-12-31 16:00:00.000000000 -0800 +++ lsp-plugins-1.1.31/debian/patches/use-fp-for-arm.patch 2022-03-09 12:57:07.000000000 -0800 @@ -0,0 +1,24 @@ +Description: use the correct machine target for armhf builds + Fixes a build failure because gcc defaults to hard float but the specified + override target does not have an FPU. + . + This patch is not correct on armel, which currently also uses the armv7a + target in debian/rules but is explicitly not guaranteed to have an FPU. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Last-Update: 2022-03-09 +Bug-Debian: https://bugs.debian.org/1003904 +Forwarded: no + +Index: lsp-plugins-1.1.31/scripts/make/configure.mk +=================================================================== +--- lsp-plugins-1.1.31.orig/scripts/make/configure.mk ++++ lsp-plugins-1.1.31/scripts/make/configure.mk +@@ -98,7 +98,7 @@ + endif + + ifeq ($(BUILD_PROFILE),armv7a) +- CC_ARCH = -march=armv7-a -marm ++ CC_ARCH = -march=armv7-a+fp -marm + endif + + ifeq ($(BUILD_PROFILE),armv7ve) diff -Nru lsp-plugins-1.1.31/debian/rules lsp-plugins-1.1.31/debian/rules --- lsp-plugins-1.1.31/debian/rules 2021-11-28 09:51:54.000000000 -0800 +++ lsp-plugins-1.1.31/debian/rules 2022-03-09 12:53:05.000000000 -0800 @@ -1,6 +1,7 @@ #!/usr/bin/make -f export PREFIX=/usr +export VERBOSE=1 include /usr/share/dpkg/architecture.mk -include /usr/share/dpkg/buildtools.mk
