Bug#923268: paulstretch FTCBFS: debian/rules hard codes build architecture build tools

[Helmut Grohne]

Source: paulstretch
Version: 2.2-2-4
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

paulstretch fails to cross build from source, because debian/rules hard
codes build architecture build tools such as g++ or pkg-config. The
attached patch seeds the tools from dpkg's buildtools.mk and makes
paulstretch cross buildable. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru paulstretch-2.2-2/debian/changelog paulstretch-2.2-2/debian/changelog
--- paulstretch-2.2-2/debian/changelog	2016-10-30 20:49:07.000000000 +0100
+++ paulstretch-2.2-2/debian/changelog	2019-02-25 17:41:21.000000000 +0100
@@ -1,3 +1,10 @@
+paulstretch (2.2-2-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Seed build tools from dpkg's buildtools.mk. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 25 Feb 2019 17:41:21 +0100
+
 paulstretch (2.2-2-4) unstable; urgency=medium
 
   * Set dh/compat 10.
diff --minimal -Nru paulstretch-2.2-2/debian/rules paulstretch-2.2-2/debian/rules
--- paulstretch-2.2-2/debian/rules	2016-10-30 20:49:07.000000000 +0100
+++ paulstretch-2.2-2/debian/rules	2019-02-25 17:41:19.000000000 +0100
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
+include /usr/share/dpkg/buildtools.mk
+PKG_CONFIG?=pkg-config
 LDFLAGS+=-Wl,--as-needed
 DESTDIR=$(CURDIR)/debian/paulstretch
 
@@ -12,13 +13,13 @@
 	# ./compile_linux_fftw.sh with custom LDFLAGS
 	fluid -c GUI.fl 
 	fluid -c FreeEditUI.fl
-	g++ $(CPPFLAGS) $(CXXFLAGS) GUI.cxx FreeEditUI.cxx `LC_ALL=C ls *.cpp Input/*.cpp Output/*.cpp` \
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) GUI.cxx FreeEditUI.cxx `LC_ALL=C ls *.cpp Input/*.cpp Output/*.cpp` \
 	  -o paulstretch \
 	  $(LDFLAGS) \
 	  `fltk-config --cflags` `fltk-config --ldflags` \
 	  -DHAVE_JACK -DENABLE_RESAMPLING \
-	  `pkg-config --cflags --libs jack samplerate` \
-	  `pkg-config --cflags --libs fftw3f vorbisenc vorbisfile vorbis ogg mad mxml audiofile` \
+	  `$(PKG_CONFIG) --cflags --libs jack samplerate` \
+	  `$(PKG_CONFIG) --cflags --libs fftw3f vorbisenc vorbisfile vorbis ogg mad mxml audiofile` \
 	  -lportaudio -lpthread -lz
 
 override_dh_installchangelogs: