Source: jconvolver
Version: 0.9.3-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

jconvolver fails to cross build from source, because it builds for the
wrong architecture. For one thing, the upstream Makefile hard codes the
build architecture compiler "g++". Making it substitutable is part of
the solution. Then jconvolver does not build anything during
dh_auto_build. The actual build is performed during make install and no
cross tools are passed at that point. Replacing all those overrides with
a --sourcedirectory flag fixes that part as well and makes jconvolver
cross buildable. Please consider applying the attached patch.

Helmut
diff --minimal -Nru jconvolver-0.9.3/debian/changelog 
jconvolver-0.9.3/debian/changelog
--- jconvolver-0.9.3/debian/changelog   2016-12-20 16:03:48.000000000 +0100
+++ jconvolver-0.9.3/debian/changelog   2018-10-16 21:26:18.000000000 +0200
@@ -1,3 +1,12 @@
+jconvolver (0.9.3-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Avoid overrides using dh --sourcedirectory.
+    + cross.patch: Make g++ substitutable.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 16 Oct 2018 21:26:18 +0200
+
 jconvolver (0.9.3-2) unstable; urgency=medium
 
   [ James Cowgill ]
diff --minimal -Nru jconvolver-0.9.3/debian/patches/cross.patch 
jconvolver-0.9.3/debian/patches/cross.patch
--- jconvolver-0.9.3/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 
+0100
+++ jconvolver-0.9.3/debian/patches/cross.patch 2018-10-16 21:26:18.000000000 
+0200
@@ -0,0 +1,29 @@
+--- jconvolver-0.9.3.orig/source/Makefile
++++ jconvolver-0.9.3/source/Makefile
+@@ -37,7 +37,7 @@
+ JCONVOLVER_O =        jconvolver.o config.o jconfig.o audiofile.o sstring.o 
jclient.o
+ jconvolver:   LDLIBS += -lzita-convolver -lfftw3f -lsndfile -lclthreads 
-ljack -lpthread -lrt
+ jconvolver:   $(JCONVOLVER_O)
+-      g++ $(LDFLAGS) -o $@ $(JCONVOLVER_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(JCONVOLVER_O) $(LDLIBS)
+ $(JCONVOLVER_O):
+ -include $(JCONVOLVER_O:%.o=%.d)
+ 
+@@ -46,7 +46,7 @@
+ FCONVOLVER_O =        fconvolver.o config.o fconfig.o audiofile.o sstring.o
+ fconvolver:   LDLIBS += -lzita-convolver -lfftw3f -lsndfile -lpthread -lrt
+ fconvolver:   $(FCONVOLVER_O)
+-      g++ $(LDFLAGS) -o $@ $(FCONVOLVER_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(FCONVOLVER_O) $(LDLIBS)
+ $(FCONVOLVER_O):
+ -include $(FCONVOLVER_O:%.o=%.d)
+ 
+@@ -55,7 +55,7 @@
+ MAKEMULTI_O = makemulti.o audiofile.o
+ makemulti : LDLIBS += -lsndfile -lrt
+ makemulti:    $(MAKEMULTI_O)
+-      g++ $(LDFLAGS) -o $@ $(MAKEMULTI_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(MAKEMULTI_O) $(LDLIBS)
+ 
+ 
+ install:      all
diff --minimal -Nru jconvolver-0.9.3/debian/patches/series 
jconvolver-0.9.3/debian/patches/series
--- jconvolver-0.9.3/debian/patches/series      2014-02-26 13:05:14.000000000 
+0100
+++ jconvolver-0.9.3/debian/patches/series      2018-10-16 21:25:04.000000000 
+0200
@@ -1,3 +1,4 @@
 makefile.patch
 makefile2.patch
 03-spelling.patch
+cross.patch
diff --minimal -Nru jconvolver-0.9.3/debian/rules jconvolver-0.9.3/debian/rules
--- jconvolver-0.9.3/debian/rules       2016-12-20 16:03:48.000000000 +0100
+++ jconvolver-0.9.3/debian/rules       2018-10-16 21:26:15.000000000 +0200
@@ -5,11 +5,4 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-       dh $@
-
-override_dh_auto_clean:
-       $(MAKE) -C source/ clean
-       dh_auto_clean
-
-override_dh_auto_install:
-       $(MAKE) -C source/ DESTDIR=$(CURDIR)/debian/jconvolver install
+       dh $@ --sourcedirectory=source

Reply via email to