[debhelper-devel] Bug#853881: debhelper makefile buildsystem: supply PKG_CONFIG for cross compilation

[Helmut Grohne]

Source: debhelper
Version: 10.2.5
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

Hi Niels,

in an earlier change, the makefile buildsystem started supplying CC and
CXX for cross compilation. That fixed a lot of cross builds, but there
are still a lot failing ones. A recurring theme is packages that use
pkg-config. Usage of pkg-config is great, because it generally does the
right thing for cross compilation, but packages tend to pick the plain
build architecture "pkg-config", which fails to find host architecture
libraries. A number of them allow substituting it via PKG_CONFIG, but
that remains unset thus far. I therefore ask you to supply PKG_CONFIG as
well. A codesearch[1] can give you an idea which packages would profit.
Of course my request comes with the trivial patch attached.

Helmut

[1] https://codesearch.debian.net/search?q=PKG_CONFIG[^_]*%3D+path%3Adebian%2Frules
-------------- next part --------------
diff --minimal -Nru debhelper-10.2.5/Debian/Debhelper/Buildsystem/makefile.pm debhelper-10.2.5+nmu1/Debian/Debhelper/Buildsystem/makefile.pm
--- debhelper-10.2.5/Debian/Debhelper/Buildsystem/makefile.pm	2016-12-07 19:46:57.000000000 +0100
+++ debhelper-10.2.5+nmu1/Debian/Debhelper/Buildsystem/makefile.pm	2017-02-01 19:49:36.000000000 +0100
@@ -12,8 +12,9 @@
 use parent qw(Debian::Debhelper::Buildsystem);
 
 my %DEB_DEFAULT_TOOLS = (
-	'CC'	=> 'gcc',
-	'CXX'	=> 'g++',
+	'CC'		=> 'gcc',
+	'CXX'		=> 'g++',
+	'PKG_CONFIG'	=> 'pkg-config',
 );
 
 # make makes things difficult by not providing a simple way to test
diff --minimal -Nru debhelper-10.2.5/debian/changelog debhelper-10.2.5+nmu1/debian/changelog
--- debhelper-10.2.5/debian/changelog	2017-01-25 21:47:27.000000000 +0100
+++ debhelper-10.2.5+nmu1/debian/changelog	2017-02-01 19:49:38.000000000 +0100
@@ -1,3 +1,11 @@
+debhelper (10.2.5+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Supply PKG_CONFIG for cross compilation with the makefile buildsystem.
+    (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 01 Feb 2017 19:49:38 +0100
+
 debhelper (10.2.5) unstable; urgency=medium
 
   [ Translations ]