Bug#923635: lierolibre FTCBFS: uses the build architecture pkg-config

[Helmut Grohne]

Source: lierolibre
Version: 0.5-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

lierolibre fails to cross build from source, because its configure.ac
runs the build architecture pkg-config. It turns out that the relevant
calls are completely unnecessary, because the PKG_CHECK_MODULES macro
will have already set up the variables with the correct values. It also
fails running sox with an "Exec format error". I think the usual fix
- marking sox Multi-Arch: foreign - is not applicable here, because sox
has format plugins. Thus, my patch is marking it :native in
Build-Depends and makes lierolibre cross buildable. Please consider
applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru lierolibre-0.5/debian/changelog lierolibre-0.5/debian/changelog
--- lierolibre-0.5/debian/changelog	2017-11-22 23:38:30.000000000 +0100
+++ lierolibre-0.5/debian/changelog	2019-03-03 08:59:40.000000000 +0100
@@ -1,3 +1,12 @@
+lierolibre (0.5-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + cross.patch: Correctly use PKG_CHECK_MODULES.
+    + Build-Depends: Use a native sox.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 03 Mar 2019 08:59:40 +0100
+
 lierolibre (0.5-3) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru lierolibre-0.5/debian/control lierolibre-0.5/debian/control
--- lierolibre-0.5/debian/control	2017-11-22 23:38:30.000000000 +0100
+++ lierolibre-0.5/debian/control	2019-03-03 08:59:40.000000000 +0100
@@ -11,7 +11,7 @@
                libsdl1.2-dev,
                libtool,
                pkg-config,
-               sox,
+               sox:native,
                zlib1g-dev
 Standards-Version: 4.1.1
 Homepage: https://launchpad.net/lierolibre
diff --minimal -Nru lierolibre-0.5/debian/patches/cross.patch lierolibre-0.5/debian/patches/cross.patch
--- lierolibre-0.5/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ lierolibre-0.5/debian/patches/cross.patch	2019-03-03 08:59:38.000000000 +0100
@@ -0,0 +1,13 @@
+--- lierolibre-0.5.orig/configure.ac
++++ lierolibre-0.5/configure.ac
+@@ -50,9 +50,7 @@
+ 
+ PKG_CHECK_MODULES([LIBCONFIGXX], [libconfig++])
+ 
+-PKG_CHECK_MODULES([SDL_MIXER], [SDL_mixer],
+-	[SDL_MIXER_CFLAGS=`pkg-config --cflags SDL_mixer` \
+-	SDL_MIXER_LIBS=`pkg-config --libs SDL_mixer`],
++PKG_CHECK_MODULES([SDL_MIXER], [SDL_mixer], [],
+ 	[pkgcSDLM="no"])
+ 
+ # Fall back on a quite stupid header check if pkg-config doesn't work
diff --minimal -Nru lierolibre-0.5/debian/patches/series lierolibre-0.5/debian/patches/series
--- lierolibre-0.5/debian/patches/series	2017-11-22 23:36:24.000000000 +0100
+++ lierolibre-0.5/debian/patches/series	2019-03-03 08:59:06.000000000 +0100
@@ -4,3 +4,4 @@
 0002-At-least-try-building-for-other-archs-than-x86.patch
 0003-Remove-unknown-arch-warning.patch
 reproducible-build.patch
+cross.patch