[SCM] jnoise/master: Fix cross build failure
mattia at users.alioth.debian.org
mattia at users.alioth.debian.org
Wed Aug 30 21:28:28 UTC 2017
The following commit has been merged in the master branch:
commit 66c7056cb4f892f1c3fe39d222062819428654b0
Author: Mattia Rizzolo <mattia at debian.org>
Date: Wed Aug 30 23:01:22 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 0acc1a5..9a4d246 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
Jaromír Mikeš <mira.mikes at seznam.cz>
Build-Depends:
debhelper (>= 10),
- binutils,
libjack-dev | libjack-jackd2-dev
Standards-Version: 4.1.0
Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/jnoise.git
diff --git a/debian/patches/02-makefile.patch b/debian/patches/02-makefile.patch
new file mode 100644
index 0000000..1e736e6
--- /dev/null
+++ b/debian/patches/02-makefile.patch
@@ -0,0 +1,17 @@
+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-29
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -37,7 +37,7 @@
+ jnoise: CPPFLAGS += -ffast-math
+ jnoise: LDLIBS += -ljack -lrt
+ jnoise: $(JNOISE_O)
+- g++ $(LDFLAGS) -o $@ $(JNOISE_O) $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(JNOISE_O) $(LDLIBS)
+
+ $(JNOISE_O):
+ -include $(JNOISE_O:%.o=%.d)
diff --git a/debian/patches/series b/debian/patches/series
index 82374e5..6adfbfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
makefile.patch
+02-makefile.patch
--
jnoise packaging
More information about the pkg-multimedia-commits
mailing list