Bug#853236: wmaker FTCBFS: uses the build architecture compiler

[Helmut Grohne]

Source: wmaker
Version: 0.95.7-7
Tags: patch upstream
User: helmutg at debian.org
Usertags: rebootstrap

wmaker fails to cross build from source, because it forces the use of
pkg-config without $ac_tool_prefix. Discovering pkg-config with the
PKG_PROG_PKG_CONFIG macro considers $ac_tool_prefix and thus makes cross
compilation succeed. Please consider applying the attached patch after
stretch is released.

Helmut
-------------- next part --------------
diff --minimal -Nru wmaker-0.95.7/debian/changelog wmaker-0.95.7/debian/changelog
--- wmaker-0.95.7/debian/changelog	2016-11-19 16:35:50.000000000 +0100
+++ wmaker-0.95.7/debian/changelog	2017-01-30 18:42:00.000000000 +0100
@@ -1,3 +1,10 @@
+wmaker (0.95.7-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: add 62_cross.diff (Closes: #-1).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 30 Jan 2017 18:42:00 +0100
+
 wmaker (0.95.7-7) unstable; urgency=medium
 
   * Add missing license information to debian/copyright.
diff --minimal -Nru wmaker-0.95.7/debian/patches/62_cross.diff wmaker-0.95.7/debian/patches/62_cross.diff
--- wmaker-0.95.7/debian/patches/62_cross.diff	1970-01-01 01:00:00.000000000 +0100
+++ wmaker-0.95.7/debian/patches/62_cross.diff	2017-01-30 18:42:00.000000000 +0100
@@ -0,0 +1,46 @@
+Subject: consider $ac_tool_prefix when searching for pkg-config
+From: Helmut Grohne <helmut at subdivi.de>
+
+--- wmaker-0.95.7.orig/configure.ac
++++ wmaker-0.95.7/configure.ac
+@@ -452,7 +452,8 @@
+ 
+ dnl pkg-config
+ dnl ==========
+-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config])
++PKG_PROG_PKG_CONFIG
++AS_IF([test -z "$PKG_CONFIG"],[AC_MSG_ERROR([pkg-config is required.])])
+ 
+ 
+ 
+@@ -617,7 +618,7 @@
+ dnl ==========
+ dnl libWINGS uses FcPatternDel from libfontconfig
+ AC_MSG_CHECKING([for fontconfig library])
+-FCLIBS=`$PKGCONFIG fontconfig --libs`
++FCLIBS=`$PKG_CONFIG fontconfig --libs`
+ if test "x$FCLIBS" = "x" ; then
+         AC_MSG_RESULT([not found])
+ else
+@@ -632,8 +633,8 @@
+ xft=yes
+ XFTLIBS=""
+ 
+-if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then
+-        XFTCONFIG="$PKGCONFIG xft"
++if test "x$PKG_CONFIG" != x -a "`$PKG_CONFIG xft; echo $?`" = 0; then
++        XFTCONFIG="$PKG_CONFIG xft"
+         pkgconfig_xft=yes
+ else
+         AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
+@@ -683,8 +684,8 @@
+ PANGOFLAGS=
+ PANGOLIBS=
+ if test "$pango" = yes; then
+-	PANGOLIBS=`$PKGCONFIG pangoxft --libs`
+-	PANGOFLAGS=`$PKGCONFIG pangoxft --cflags`
++	PANGOLIBS=`$PKG_CONFIG pangoxft --libs`
++	PANGOFLAGS=`$PKG_CONFIG pangoxft --cflags`
+ 	if test "x$PANGOLIBS" = "x" ; then
+ 	        AC_MSG_RESULT([not found])
+ 	else
diff --minimal -Nru wmaker-0.95.7/debian/patches/series wmaker-0.95.7/debian/patches/series
--- wmaker-0.95.7/debian/patches/series	2016-11-19 16:31:00.000000000 +0100
+++ wmaker-0.95.7/debian/patches/series	2017-01-30 18:40:28.000000000 +0100
@@ -7,3 +7,4 @@
 57_ignore_with-aix-soname.diff
 60_fix_wraster_symbol_versioning.diff
 61_fix_wmmenugen_segfault.diff
+62_cross.diff