Bug#852741: wvstreams FTCBFS: uses build architecture pkg-config, fails to detect required libraries
Source: wvstreams
Version: 4.6.1-11
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
wvstreams fails to cross build from source, because it uses the build
architecture pkg-config. It thus fails finding required libraries. Using
a triplet-prefixed pkg-config fixes the issue and makes cross builds
succeed. Please consider applying the attached patch.
Helmut
diff --minimal -Nru wvstreams-4.6.1/debian/changelog wvstreams-4.6.1/debian/changelog
--- wvstreams-4.6.1/debian/changelog 2016-12-17 11:02:02.000000000 +0100
+++ wvstreams-4.6.1/debian/changelog 2017-01-26 21:44:34.000000000 +0100
@@ -1,3 +1,10 @@
+wvstreams (4.6.1-11.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: 12_cross.patch: Use triplet-prefixed pkg-config (Closes: #-1).
+
+ -- Helmut Grohne <helmut@subdivi.de> Thu, 26 Jan 2017 21:44:34 +0100
+
wvstreams (4.6.1-11) unstable; urgency=medium
* QA upload.
diff --minimal -Nru wvstreams-4.6.1/debian/patches/12_cross.diff wvstreams-4.6.1/debian/patches/12_cross.diff
--- wvstreams-4.6.1/debian/patches/12_cross.diff 1970-01-01 01:00:00.000000000 +0100
+++ wvstreams-4.6.1/debian/patches/12_cross.diff 2017-01-26 21:44:34.000000000 +0100
@@ -0,0 +1,53 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Subject: prefix pkg-config with $ac_tool_prefix to support cross compilation
+
+Index: wvstreams-4.6.1/configure.ac
+===================================================================
+--- wvstreams-4.6.1.orig/configure.ac
++++ wvstreams-4.6.1/configure.ac
+@@ -345,8 +345,8 @@
+ LDFLAGS="$LDFLAGS_save"
+
+ # Detect pkg-config
+-AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
+-if test "$PKGCONFIG" = "no"; then
++PKG_PROG_PKG_CONFIG
++if test "x$PKG_CONFIG" = "x"; then
+ AC_MSG_WARN([pkg-config is not installed])
+ fi
+
+@@ -370,10 +370,10 @@
+ if test "$with_dbus" != "no"; then
+ if test "$with_dbus" = "" -o "$with_dbus" = "yes"; then
+ AC_MSG_CHECKING([Checking that D-Bus version greater than 1.2.14 installed.])
+- if pkg-config --atleast-version 1.2.14 dbus-1; then
+- WV_APPEND(CPPFLAGS, [`pkg-config --cflags dbus-1`])
+- WV_APPEND(LDFLAGS, [`pkg-config --libs-only-L dbus-1`])
+- LIBS_DBUS=`pkg-config --libs-only-l dbus-1`
++ if $PKG_CONFIG --atleast-version 1.2.14 dbus-1; then
++ WV_APPEND(CPPFLAGS, [`$PKG_CONFIG --cflags dbus-1`])
++ WV_APPEND(LDFLAGS, [`$PKG_CONFIG --libs-only-L dbus-1`])
++ LIBS_DBUS=`$PKG_CONFIG --libs-only-l dbus-1`
+ AC_MSG_RESULT([yes])
+ else
+ with_dbus=no
+@@ -497,7 +497,7 @@
+ CPPFLAGS_save="$CPPFLAGS"
+ LDFLAGS_save="$LDFLAGS"
+ LIBS_save="$LIBS"
+- for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH $(pkg-config --variable=prefix qt-mt); do
++ for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH $($PKG_CONFIG --variable=prefix qt-mt); do
+ eval wv_qtdir="$wv_qtdir"
+ CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
+ LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
+Index: wvstreams-4.6.1/autogen.sh
+===================================================================
+--- wvstreams-4.6.1.orig/autogen.sh
++++ wvstreams-4.6.1/autogen.sh
+@@ -1,5 +1,6 @@
+ #!/bin/sh
+ set -e
++aclocal
+ autoheader
+ autoconf
+ (cd argp && autoconf)
diff --minimal -Nru wvstreams-4.6.1/debian/patches/series wvstreams-4.6.1/debian/patches/series
--- wvstreams-4.6.1/debian/patches/series 2016-07-11 13:41:28.000000000 +0200
+++ wvstreams-4.6.1/debian/patches/series 2017-01-26 21:43:10.000000000 +0100
@@ -9,3 +9,4 @@
10_readline.diff
11_typos.diff
gcc-6.patch
+12_cross.diff
Reply to: