[SCM] qm-dsp/master: Fix FTCBFS. (Closes: #872249)

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0860d56f46e86cdbb37e634ed45f332728179e97
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Aug 15 15:44:49 2017 +0200

    Fix FTCBFS. (Closes: #872249)

diff --git a/debian/rules b/debian/rules
index e500c9f..ae27744 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 PREFIX = /usr
 LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 DESTDIR=$(CURDIR)/debian/tmp
@@ -12,6 +12,11 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 MAJVERS = 0
 MINVERS = 0.0
 
+ifeq ($(origin CXX),default)
+CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
+PKG_CONFIG ?= $(DEB_HOST_GNU_TYPE)-pkg-config
+
 CFLAGS += -DNDEBUG -O3 -fPIC -ffast-math -ftree-vectorize -DUSE_PTHREADS
 CXXFLAGS += -fPIC -Wall
 CXXFLAGS += $(CFLAGS)
@@ -22,8 +27,8 @@ QM-DSP_MIN = $(QM-DSP_MAJ).$(MINVERS)
 QM-DSP_DEP = libqm-dsp.a
 QM-DSP_H = qm-dsp
 
-QM-DSP_CFLAGS=$(shell pkg-config --cflags blas-atlas lapack-atlas)
-QM-DSP_LFLAGS=-llapack_atlas $(shell pkg-config --libs blas-atlas lapack-atlas) -lpthread
+QM-DSP_CFLAGS=$(shell $(PKG_CONFIG) --cflags blas-atlas lapack-atlas)
+QM-DSP_LFLAGS=-llapack_atlas $(shell $(PKG_CONFIG) --libs blas-atlas lapack-atlas) -lpthread
 
 CFLAGS+=$(QM-DSP_CFLAGS)
 
@@ -31,9 +36,9 @@ CFLAGS+=$(QM-DSP_CFLAGS)
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) -f build/general/Makefile.inc
+	dh_auto_build --buildsystem=makefile -- -f build/general/Makefile.inc
 	dh_auto_build
-	g++ -shared $(LDFLAGS) -o $(QM-DSP_MAJ) -Wl,-soname,$(QM-DSP_MAJ) -Wl,--whole-archive $(QM-DSP_DEP) -Wl,--no-whole-archive $(QM-DSP_LFLAGS)
+	$(CXX) -shared $(LDFLAGS) -o $(QM-DSP_MAJ) -Wl,-soname,$(QM-DSP_MAJ) -Wl,--whole-archive $(QM-DSP_DEP) -Wl,--no-whole-archive $(QM-DSP_LFLAGS)
 
 override_dh_auto_install:
 	install -d $(DESTDIR)$(PREFIX)/include/$(QM-DSP_H)/base

-- 
qm-dsp packaging