diff options
author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2016-11-22 16:32:51 +0100 |
---|---|---|
committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2016-12-05 10:57:10 +0100 |
commit | e9b2084592aaab84dc08a917e85aee9827027f08 (patch) | |
tree | aff05948ef6885c908f03ca7572550bbc22a256d | |
parent | f3bd0d149174b2bbb4983b48e603e060a3e18c22 (diff) | |
download | meson-e9b2084592aaab84dc08a917e85aee9827027f08.zip meson-e9b2084592aaab84dc08a917e85aee9827027f08.tar.gz meson-e9b2084592aaab84dc08a917e85aee9827027f08.tar.bz2 |
dependencies: allow overriding pkg-config with PKG_CONFIG in check_pkgconfig
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r-- | mesonbuild/dependencies.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index a092732..5f0c261 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -229,12 +229,17 @@ class PkgConfigDependency(Dependency): def check_pkgconfig(self): try: - p = subprocess.Popen(['pkg-config', '--version'], stdout=subprocess.PIPE, + evar = 'PKG_CONFIG' + if evar in os.environ: + pkgbin = os.environ[evar].strip() + else: + pkgbin = 'pkg-config' + p = subprocess.Popen([pkgbin, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out = p.communicate()[0] if p.returncode == 0: if not self.silent: - mlog.log('Found pkg-config:', mlog.bold(shutil.which('pkg-config')), + mlog.log('Found pkg-config:', mlog.bold(shutil.which(pkgbin)), '(%s)' % out.decode().strip()) PkgConfigDependency.pkgconfig_found = True return |