Bug#875862: jack-audio-connection-kit FTCBFS: powerpc64le-linux-gnu-gcc does not recognize -m3dnow

[Helmut Grohne]

Source: jack-audio-connection-kit
Version: 1:0.125.0-2
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

jack-audio-connection-kit fails to cross build from source from e.g.
amd64 to ppc64el, because it passes -m3dnow to compilers that don't
understand that flag. It seems that debian/rules generally confuses
build architecture and host architecture. The attached patch fixes that
and makes jack-audio-connection-kit cross build successfully. Please
apply it.

Helmut
-------------- next part --------------
diff --minimal -Nru jack-audio-connection-kit-0.125.0/debian/changelog jack-audio-connection-kit-0.125.0/debian/changelog
--- jack-audio-connection-kit-0.125.0/debian/changelog	2016-12-04 12:27:11.000000000 +0100
+++ jack-audio-connection-kit-0.125.0/debian/changelog	2017-09-15 12:41:49.000000000 +0200
@@ -1,3 +1,10 @@
+jack-audio-connection-kit (1:0.125.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Fix build/host confusion in debian/rules. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 15 Sep 2017 12:41:49 +0200
+
 jack-audio-connection-kit (1:0.125.0-2) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru jack-audio-connection-kit-0.125.0/debian/rules jack-audio-connection-kit-0.125.0/debian/rules
--- jack-audio-connection-kit-0.125.0/debian/rules	2016-12-03 15:30:39.000000000 +0100
+++ jack-audio-connection-kit-0.125.0/debian/rules	2017-09-15 12:40:44.000000000 +0200
@@ -19,6 +19,7 @@
 export DH_OPTIONS = -Njackd1-firewire
 endif
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
@@ -45,9 +46,7 @@
 	--disable-ensure-mlock --enable-sse=yes --enable-static=yes
 	# --enable-posix-shm
 
-_build_arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH ?= $(_build_arch)
-ifneq (,$(filter amd64,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter amd64,$(DEB_HOST_ARCH)))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-dynsimd=yes
 endif
 
@@ -66,7 +65,7 @@
 
 ifneq (,$(filter doopt,$(DEB_BUILD_OPTIONS)))
 # do optimization for the different architectures
-  ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
+  ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
     DEB_CONFIGURE_EXTRA_FLAGS += --enable-optimize --enable-sse --enable-mmx -enable-dynsimd
     OPTI_FLAGS := -D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops
     CXXFLAGS += $(OPTI_FLAGS)
@@ -84,7 +83,7 @@
 # endif
 endif
 
-ifneq (,$(filter amd64,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter amd64,$(DEB_HOST_ARCH)))
 CFLAGS += -m3dnow -msse
 endif