Source: zita-alsa-pcmi
Version: 0.2.0-4
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
zita-alsa-pcmi fails to cross build from source for multiple reasons:
* It doesn't pass cross tools to make. -> Use dh_auto_build.
* The upstream build system hard codes g++. -> Use $(CXX).
* The upstream build system uses ldconfig. -> Make a symlink.
After fixing these, it cross builds successfully. Please consider
applying the attached patch.
Helmut
diff --minimal -Nru zita-alsa-pcmi-0.2.0/debian/changelog
zita-alsa-pcmi-0.2.0/debian/changelog
--- zita-alsa-pcmi-0.2.0/debian/changelog 2016-12-27 12:03:32.000000000
+0100
+++ zita-alsa-pcmi-0.2.0/debian/changelog 2018-04-24 19:30:43.000000000
+0200
@@ -1,3 +1,13 @@
+zita-alsa-pcmi (0.2.0-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + Make g++ substitutable.
+ + ldconfig doesn't work during cross.
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 24 Apr 2018 19:30:43 +0200
+
zita-alsa-pcmi (0.2.0-4) unstable; urgency=medium
* Set dh/compat 10.
diff --minimal -Nru zita-alsa-pcmi-0.2.0/debian/patches/01-makefile.patch
zita-alsa-pcmi-0.2.0/debian/patches/01-makefile.patch
--- zita-alsa-pcmi-0.2.0/debian/patches/01-makefile.patch 2013-08-12
20:42:47.000000000 +0200
+++ zita-alsa-pcmi-0.2.0/debian/patches/01-makefile.patch 2018-04-24
19:30:43.000000000 +0200
@@ -28,7 +28,7 @@
install -Dm 644 $(ZITA-ALSA-PCMI_MIN)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
ln -sf $(ZITA-ALSA-PCMI_MIN)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
- ldconfig
-+ /sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
++ ln -sf $(ZITA-ALSA-PCMI_MIN)
$(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MAJ)
uninstall:
rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h
diff --minimal -Nru zita-alsa-pcmi-0.2.0/debian/patches/05-cross.patch
zita-alsa-pcmi-0.2.0/debian/patches/05-cross.patch
--- zita-alsa-pcmi-0.2.0/debian/patches/05-cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ zita-alsa-pcmi-0.2.0/debian/patches/05-cross.patch 2018-04-24
19:30:43.000000000 +0200
@@ -0,0 +1,37 @@
+Make g++ substitutable for cross compilation.
+
+Index: zita-alsa-pcmi-0.2.0/libs/Makefile
+===================================================================
+--- zita-alsa-pcmi-0.2.0.orig/libs/Makefile
++++ zita-alsa-pcmi-0.2.0/libs/Makefile
+@@ -45,7 +45,7 @@
+
+
+ $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O)
+- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o
$(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o
$(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
+
+
+ install: $(ZITA-ALSA-PCMI_MIN)
+Index: zita-alsa-pcmi-0.2.0/apps/Makefile
+===================================================================
+--- zita-alsa-pcmi-0.2.0.orig/apps/Makefile
++++ zita-alsa-pcmi-0.2.0/apps/Makefile
+@@ -34,7 +34,7 @@
+ ALSA_LOOPBACK_O = alsa_loopback.o pxthread.o
+ alsa_loopback: LDLIBS += ../libs/libzita-alsa-pcmi.so.0.2.0 -lasound
-lpthread -lrt
+ alsa_loopback: $(ALSA_LOOPBACK_O)
+- g++ $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
+ $(ALSA_LOOPBACK_O):
+ -include $(_ALSA_LOOPBACK_O:%.o=%.d)
+
+@@ -42,7 +42,7 @@
+ ALSA_DELAY_O = alsa_delay.o mtdm.o pxthread.o
+ alsa_delay: LDLIBS += ../libs/libzita-alsa-pcmi.so.0.2.0 -lasound -lpthread
-lrt
+ alsa_delay: $(ALSA_DELAY_O)
+- g++ $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
+ $(ALSA_DELAY_O):
+ -include $(ALSA_DELAY_O:%.o=%.d)
+
diff --minimal -Nru zita-alsa-pcmi-0.2.0/debian/patches/series
zita-alsa-pcmi-0.2.0/debian/patches/series
--- zita-alsa-pcmi-0.2.0/debian/patches/series 2016-12-27 12:03:32.000000000
+0100
+++ zita-alsa-pcmi-0.2.0/debian/patches/series 2018-04-24 19:30:43.000000000
+0200
@@ -2,3 +2,4 @@
02-missing_include.patch
03-fix_usage.patch
04-spelling.patch
+05-cross.patch
diff --minimal -Nru zita-alsa-pcmi-0.2.0/debian/rules
zita-alsa-pcmi-0.2.0/debian/rules
--- zita-alsa-pcmi-0.2.0/debian/rules 2016-12-27 12:03:32.000000000 +0100
+++ zita-alsa-pcmi-0.2.0/debian/rules 2018-04-24 19:30:41.000000000 +0200
@@ -13,8 +13,8 @@
dh $@ -Smakefile
override_dh_auto_build:
- $(MAKE) -C libs/
- $(MAKE) -C apps/
+ dh_auto_build --sourcedirectory=libs/
+ dh_auto_build --sourcedirectory=apps/
override_dh_auto_clean:
dh_auto_clean
