[Debian-med-packaging] Bug#871513: muscle FTCBFS: hard codes the build architecture compiler g++

[Helmut Grohne]

Source: muscle
Version: 1:3.8.31+dfsg-2
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

muscle fails to cross build from source, because it hard codes the build
architecture compiler in the patched makefile. Updating the patch to use
$(CXX) fixes the build. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru muscle-3.8.31+dfsg/debian/changelog muscle-3.8.31+dfsg/debian/changelog
--- muscle-3.8.31+dfsg/debian/changelog	2016-06-30 08:39:17.000000000 +0200
+++ muscle-3.8.31+dfsg/debian/changelog	2017-08-08 20:30:21.000000000 +0200
@@ -1,3 +1,11 @@
+muscle (1:3.8.31+dfsg-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do not hard code build architecture compiler g++. (Closes:
+    #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 08 Aug 2017 20:30:21 +0200
+
 muscle (1:3.8.31+dfsg-2) unstable; urgency=low
  
   * Team upload
diff --minimal -Nru muscle-3.8.31+dfsg/debian/patches/makefile.patch muscle-3.8.31+dfsg/debian/patches/makefile.patch
--- muscle-3.8.31+dfsg/debian/patches/makefile.patch	2016-06-30 08:39:17.000000000 +0200
+++ muscle-3.8.31+dfsg/debian/patches/makefile.patch	2017-08-08 20:30:13.000000000 +0200
@@ -20,7 +20,7 @@
 +	$(CXX) -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 +
 +muscle: $(ObjNames)
-+	g++ $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o muscle $(ObjNames)
++	$(CXX) $(LDLIBS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o muscle $(ObjNames)
 +
 +clean:
 +	$(RM) *.o make.err make.out muscle