[SCM] aliki/master: Fix cross build failure

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4ef496604adcb945c93e257f9ae830257a9b0d98
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Aug 31 15:31:36 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)
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index 7cd0e23..5926f5f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
- binutils,
  debhelper (>= 10),
  libclalsadrv-dev (>= 2.0.0),
  libclthreads-dev (>= 2.4.0),
diff --git a/debian/patches/03-makefile.patch b/debian/patches/03-makefile.patch
new file mode 100644
index 0000000..9870ed8
--- /dev/null
+++ b/debian/patches/03-makefile.patch
@@ -0,0 +1,26 @@
+Description: use $(CXX) instead of hardcoding g++
+ This fixes cross building, where the compiler used is prefixed by the host architecture
+Author: Mattia Rizzolo <mattia at debian.org>
+Last-Update: 2017-08-31
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -41,7 +41,7 @@
+ aliki:	LDLIBS += -lclxclient -lclthreads -lsndfile -lfftw3f -lXft -lX11 -lpthread -lrt
+ aliki:	LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
+ aliki:	$(ALIKI_O)
+-	g++ $(LDFLAGS) -o $@ $(ALIKI_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ALIKI_O) $(LDLIBS)
+ $(ALIKI_O):
+ -include $(ALIKI_O:%.o=%.d)
+ 
+@@ -51,7 +51,7 @@
+ aliki-rt:	LDLIBS += -lzita-alsa-pcmi -lclthreads -lsndfile -ljack -lasound -lpthread -lrt
+ aliki-rt:	LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+ aliki-rt:	 $(ALIKI_RT_O) $(LIBCLX)
+-	g++ $(LDFLAGS) -o $@ $(ALIKI_RT_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ALIKI_RT_O) $(LDLIBS)
+ $(ALIKI_RT_O):
+ -include $(ALIKI_RT_O:%.o=%.d)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2eee416..0dd7914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-makefile.patch
 02-spelling_fix.patch
+03-makefile.patch

-- 
aliki packaging