[SCM] jkmeter/master: Fix cross build failure

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3e417a76899bcdf6dfed6257e369b7f11c45f0c0
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Aug 29 14:56:48 2017 +0200

    Fix cross build failure
    
    + Drop implicitly satisfied build dependency on binutils
    + Make g++ substitutable in source/Makefile
    
    (yes, patch forwarded upstream via private mail)
    
    Closes: #873601
    Thanks: Helmut Grohne <helmut at subdivi.de> for the patch
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index 62f5b50..7ff1a1d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Free Ekanayaka <freee at debian.org>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
- binutils,
  debhelper (>= 10),
  libclthreads-dev (>= 2.4.0),
  libclxclient-dev (>= 3.9.0),
diff --git a/debian/patches/03-makefile.patch b/debian/patches/03-makefile.patch
new file mode 100644
index 0000000..ae03016
--- /dev/null
+++ b/debian/patches/03-makefile.patch
@@ -0,0 +1,19 @@
+Description: use $(CXX) instead of hardcoding g++
+ This fixes cross building, where the compiler used is prefixed by the host architecture
+Author: Helmut Grohne <helmut at subdivi.de>
+Acked-By: Mattia Rizzolo <mattia at debian.org>
+Bug-Debian: https://bugs.debian.org/873601
+Last-Update: 2017-08-29
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -40,7 +40,7 @@
+ jkmeter:	LDFLAGS += -L/usr/X11R6/lib
+ jkmeter:	LDFLAGS += -pthread
+ jkmeter:	$(JKMETER_O)
+-	g++ $(LDFLAGS) -o $@ $(JKMETER_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(JKMETER_O) $(LDLIBS)
+ 
+ $(JKMETER_O):
+ -include $(JKMETER_O:%.o=%.d)
diff --git a/debian/patches/series b/debian/patches/series
index 758a3ff..3b99806 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-makefile.patch
 02-build_with_new_libpng.patch
+03-makefile.patch

-- 
jkmeter packaging