Bug#853188: clthreads FTCBFS: uses the build architecture compiler for linking

[Helmut Grohne]

Source: clthreads
Version: 2.4.0-6
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

clthreads fails to cross build from source, because it uses the build
architecture compiler for linking. This is a copy of clxclient #853012.
Again replacing g++ with $(CXX) makes cross compilation succeed. Please
consider applying the attached patch after stretch is released.

Helmut
-------------- next part --------------
diff --minimal -Nru clthreads-2.4.0/debian/changelog clthreads-2.4.0/debian/changelog
--- clthreads-2.4.0/debian/changelog	2016-12-03 20:01:20.000000000 +0100
+++ clthreads-2.4.0/debian/changelog	2017-01-30 15:29:33.000000000 +0100
@@ -1,3 +1,10 @@
+clthreads (2.4.0-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: make C++ compiler substitutable (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 30 Jan 2017 15:29:33 +0100
+
 clthreads (2.4.0-6) unstable; urgency=medium
 
   * Bump Standards.
diff --minimal -Nru clthreads-2.4.0/debian/patches/makefile-03.patch clthreads-2.4.0/debian/patches/makefile-03.patch
--- clthreads-2.4.0/debian/patches/makefile-03.patch	1970-01-01 01:00:00.000000000 +0100
+++ clthreads-2.4.0/debian/patches/makefile-03.patch	2017-01-30 15:29:31.000000000 +0100
@@ -0,0 +1,14 @@
+Description: make C++ compiler overridable for cross compilation
+Author: Helmut Grohne <helmut at subdivi.de>
+
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@
+ 
+ 
+ $(CLTHREADS_MIN): $(CLTHREADS_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
+ 
+ 
+ install:	$(CLTHREADS_MIN)
diff --minimal -Nru clthreads-2.4.0/debian/patches/series clthreads-2.4.0/debian/patches/series
--- clthreads-2.4.0/debian/patches/series	2016-12-03 19:57:24.000000000 +0100
+++ clthreads-2.4.0/debian/patches/series	2017-01-30 15:28:59.000000000 +0100
@@ -1,2 +1,3 @@
 makefile-01.patch
 makefile-02.patch
+makefile-03.patch