Bug#864556: clalsadrv FTCBFS: hard codes build architecture compiler

[Helmut Grohne]

Source: clalsadrv
Version: 2.0.0-3
Tags: patch upstream
User: helmutg at debian.org
Usertags: rebootstrap

clalsadrv fails to cross build from source, because libs/Makefile hard
codes the build architecture compiler g++. Using $(CXX) instead makes
cross builds succeed. Please consider applying the attached patch after
stretch is released.

Helmut
-------------- next part --------------
diff --minimal -Nru clalsadrv-2.0.0/debian/changelog clalsadrv-2.0.0/debian/changelog
--- clalsadrv-2.0.0/debian/changelog	2010-07-09 15:51:23.000000000 +0200
+++ clalsadrv-2.0.0/debian/changelog	2017-06-10 17:38:43.000000000 +0200
@@ -1,3 +1,10 @@
+clalsadrv (2.0.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: 02-cross.patch (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 10 Jun 2017 17:38:43 +0200
+
 clalsadrv (2.0.0-3) unstable; urgency=low
 
   * Change my email address.
diff --minimal -Nru clalsadrv-2.0.0/debian/patches/02-cross.patch clalsadrv-2.0.0/debian/patches/02-cross.patch
--- clalsadrv-2.0.0/debian/patches/02-cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ clalsadrv-2.0.0/debian/patches/02-cross.patch	2017-06-10 17:38:39.000000000 +0200
@@ -0,0 +1,16 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: make g++ substitutable for cross compilation
+
+Index: clalsadrv-2.0.0/libs/Makefile
+===================================================================
+--- clalsadrv-2.0.0.orig/libs/Makefile
++++ clalsadrv-2.0.0/libs/Makefile
+@@ -41,7 +41,7 @@
+ 
+ 
+ $(CLALSADRV_MIN): $(CLALSADRV_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
+ 
+ 
+ install:	$(CLALSADRV_MIN)
diff --minimal -Nru clalsadrv-2.0.0/debian/patches/series clalsadrv-2.0.0/debian/patches/series
--- clalsadrv-2.0.0/debian/patches/series	2010-07-09 15:27:06.000000000 +0200
+++ clalsadrv-2.0.0/debian/patches/series	2017-06-10 17:37:54.000000000 +0200
@@ -1 +1,2 @@
 01-makefile.patch
+02-cross.patch