Bug#971034: libpfm4 FTCBFS: misdetects some architectures
Source: libpfm4
Version: 4.10.1+git44-ga2909cd-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
libpfm4 is already quite well prepared for cross compilation.
Unfortunately, the ARCH= flag is not passed for every architectures. For
some such as s390x is missing and there it fails to build. Please
consider applying the attached patch to always pass it.
Helmut
diff --minimal -Nru libpfm4-4.10.1+git44-ga2909cd/debian/changelog libpfm4-4.10.1+git44-ga2909cd/debian/changelog
--- libpfm4-4.10.1+git44-ga2909cd/debian/changelog 2020-03-08 14:23:00.000000000 +0100
+++ libpfm4-4.10.1+git44-ga2909cd/debian/changelog 2020-09-26 18:14:34.000000000 +0200
@@ -1,3 +1,10 @@
+libpfm4 (4.10.1+git44-ga2909cd-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Pass ARCH= for any architecture. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 26 Sep 2020 18:14:34 +0200
+
libpfm4 (4.10.1+git44-ga2909cd-1) unstable; urgency=medium
* New upstream GIT snapshot.
diff --minimal -Nru libpfm4-4.10.1+git44-ga2909cd/debian/rules libpfm4-4.10.1+git44-ga2909cd/debian/rules
--- libpfm4-4.10.1+git44-ga2909cd/debian/rules 2020-03-08 14:23:00.000000000 +0100
+++ libpfm4-4.10.1+git44-ga2909cd/debian/rules 2020-09-26 18:12:05.000000000 +0200
@@ -16,12 +16,12 @@
# architecture mapping $(DEB_HOST_ARCH) => libpfm4 ARCH
# in case that can't be derived from the cpu correctly
# e.g. cross-compiling for a 32-bit architecture on a 64-bit cpu
+LIBPFM4_ARCH_amd64 = x86_64
LIBPFM4_ARCH_armel = arm
LIBPFM4_ARCH_armhf = arm
-LIBPFM4_ARCH_i386 = i386
LIBPFM4_ARCH_ppc64el = powerpc
-LIBPFM4_ARCH_FLAG = $(foreach a,$(strip $(LIBPFM4_ARCH_$(DEB_HOST_ARCH))),ARCH=$a)
+LIBPFM4_ARCH_FLAG = ARCH=$(or $(LIBPFM4_ARCH_$(DEB_HOST_ARCH_CPU)),$(DEB_HOST_ARCH_CPU))
%:
dh $@
Reply to: