diff options
| author | Uri Simchoni <uri@samba.org> | 2017-01-19 07:46:57 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-02-15 11:42:21 +0100 |
| commit | c808b732fbfcf88bb64a48978dd98345b99feabe (patch) | |
| tree | c032a6a7cbe7a1b2fad21a37e0fc7bc1ce2c2411 | |
| parent | 1b6b200ee72744783c08326c597ee73017b3f531 (diff) | |
| download | samba-c808b732fbfcf88bb64a48978dd98345b99feabe.tar.gz | |
waf: backport finding of pkg-config
Allow the builder to customize the location of pkg-config
utility by setting PKGCONFIG environment variable.
This is backported from upstream waf.
Thanks to Zentaro Kavanagh <zentaro@google.com> for
pointing that out and proposing the fix.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12529
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Jan 25 04:23:00 CET 2017 on sn-devel-144
(cherry picked from commit 2cf141ed45b4f7b7754cb9525d987ff38495d789)
| -rw-r--r-- | third_party/waf/wafadmin/Tools/config_c.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/waf/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py index 3ab447ccf42..cdf3b3ebb68 100644 --- a/third_party/waf/wafadmin/Tools/config_c.py +++ b/third_party/waf/wafadmin/Tools/config_c.py @@ -106,7 +106,9 @@ def ret_msg(self, f, kw): @conf def validate_cfg(self, kw): if not 'path' in kw: - kw['path'] = 'pkg-config --errors-to-stdout --print-errors' + if not self.env.PKGCONFIG: + self.find_program('pkg-config', var='PKGCONFIG') + kw['path'] = self.env.PKGCONFIG # pkg-config version if 'atleast_pkgconfig_version' in kw: |