diff options
author | Niels Thykier <niels@thykier.net> | 2017-02-18 17:50:37 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2017-02-18 17:50:49 +0000 |
commit | 68cc5f58ef61a74c78e5337bd836c7cc3670147d (patch) | |
tree | 5b572ff6d243143e48371f10c45d1fb91a03653d | |
parent | c56dd6f1b28d4c9320ef8921fb70c85540a9f7dd (diff) | |
download | debhelper-68cc5f58ef61a74c78e5337bd836c7cc3670147d.tar.gz |
Set PKG_CONFIG for makefile buildsystems
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | Debian/Debhelper/Buildsystem/makefile.pm | 5 | ||||
-rw-r--r-- | debian/changelog | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index 6ea8e39f..42b184e4 100644 --- a/Debian/Debhelper/Buildsystem/makefile.pm +++ b/Debian/Debhelper/Buildsystem/makefile.pm @@ -12,8 +12,9 @@ use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value escape_shell clean_jobs 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 --git a/debian/changelog b/debian/changelog index 9a1fc109..8b5cf60c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (10.2.6) UNRELEASED; urgency=medium + + * Supply PKG_CONFIG for cross compilation with the makefile buildsystem. + (Closes: #853881) + + -- Helmut Grohne <helmut@subdivi.de> Sat, 18 Feb 2017 17:49:08 +0000 + debhelper (10.2.5) unstable; urgency=medium [ Translations ] |