[SCM] zita-mu1/master: Fix cross build failed:

mattia at users.alioth.debian.org mattia at users.alioth.debian.org
Tue Aug 29 12:35:03 UTC 2017


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

    Fix cross build failed:
    
    + Drop implicitly satisfied build dependency on binutils
    + Make g++ substitutable in source/Makefile
    
    (yes, patch forwarded upstream via private mail)
    
    Closes: #873506
    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 b00579d..e523bf0 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),
  libcairo2-dev,
  libclthreads-dev (>= 2.4.0),
diff --git a/debian/patches/02-makefile.patch b/debian/patches/02-makefile.patch
new file mode 100644
index 0000000..8762a26
--- /dev/null
+++ b/debian/patches/02-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/873506
+Last-Update: 2017-08-29
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -42,7 +42,7 @@
+ zita-mu1:	LDLIBS += -lsndfile -lclxclient -lclthreads -ljack -lpthread -lcairo -lpng -lXft -lX11 -lrt
+ zita-mu1:	LDFLAGS += -L/usr/X11R6/lib
+ zita-mu1:	$(ZITA-MU1_O)
+-	g++ $(LDFLAGS) -o $@ $(ZITA-MU1_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ZITA-MU1_O) $(LDLIBS)
+ 
+ $(ZITA-MU1_O):
+ -include $(ZITA-MU1_O:%.o=%.d)
diff --git a/debian/patches/series b/debian/patches/series
index d3b72df..f3a7b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-makefile.patch
+02-makefile.patch

-- 
zita-mu1 packaging



More information about the pkg-multimedia-commits mailing list