Bug#870859: jaaa FTCBFS: hardcodes the build architecture compiler in one place

[Helmut Grohne]

Source: jaaa
Version: 0.8.4-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

jaaa fails to cross build from source, because its final link step hard
codes the build architecture compiler (g++) in the upstream build
system. After making that substitutable, it cross builds successfully.
Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru jaaa-0.8.4/debian/changelog jaaa-0.8.4/debian/changelog
--- jaaa-0.8.4/debian/changelog	2016-12-22 13:52:44.000000000 +0100
+++ jaaa-0.8.4/debian/changelog	2017-08-05 21:53:50.000000000 +0200
@@ -1,3 +1,10 @@
+jaaa (0.8.4-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do not hard code g++. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 05 Aug 2017 21:53:50 +0200
+
 jaaa (0.8.4-3) unstable; urgency=medium
 
   * Set dh 10.
diff --minimal -Nru jaaa-0.8.4/debian/patches/jaaa-rzr.patch jaaa-0.8.4/debian/patches/jaaa-rzr.patch
--- jaaa-0.8.4/debian/patches/jaaa-rzr.patch	2013-08-12 21:34:53.000000000 +0200
+++ jaaa-0.8.4/debian/patches/jaaa-rzr.patch	2017-08-05 21:53:31.000000000 +0200
@@ -4,11 +4,11 @@
  Makefile |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 Index: jaaa/source/Makefile
 ===================================================================
 --- jaaa.orig/source/Makefile	2013-08-07 13:38:13.937342777 +0200
 +++ jaaa/source/Makefile	2013-08-07 14:01:17.176201895 +0200
-@@ -19,13 +19,13 @@
+@@ -19,26 +19,27 @@
  #  --------------------------------------------------------------------------
  
  
@@ -25,7 +25,14 @@
  LDFLAGS += -L/usr/X11R6/$(LIBDIR)
  LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
  
-@@ -39,6 +39,7 @@
+ 
+ JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
+ jaaa:	$(JAAA_O)
+-	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
+ 
+ $(JAAA_O):
+ -include $(JAAA_O:%.o=%.d)
  
  
  install:	jaaa