diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-17 10:36:21 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-26 23:28:33 +0300 |
| commit | e182dba61feb5b6872154e245014c58d99aa39d8 (patch) | |
| tree | 9398604c60386e6c4019fe4e72f33b9901f17b49 /mesonbuild/dependencies/base.py | |
| parent | 41a0292993f6caa00fd7dea3bfe922220cd2d4e1 (diff) | |
| download | meson-e182dba61feb5b6872154e245014c58d99aa39d8.zip meson-e182dba61feb5b6872154e245014c58d99aa39d8.tar.gz meson-e182dba61feb5b6872154e245014c58d99aa39d8.tar.bz2 | |
dependencies/base: Set PKG_CONFIG_SYSROOT_DIR from cross file
In some cases it may be necessary to set PKG_CONFIG_SYSROOT_DIR, like
when you've mounted a host architecture system in an arbitrary path.
Meson will now check the cross files for a [properties]:sys_root
variable and set the PKG_CONFIG_SYSROOT_DIR environment variable based
on that variable.
Fixes #3801
Fixes #4057
Diffstat (limited to 'mesonbuild/dependencies/base.py')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 7f2c344..fdfd143 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -655,9 +655,13 @@ class PkgConfigDependency(ExternalDependency): env = env.copy() extra_paths = self.env.coredata.builtins_per_machine[self.for_machine]['pkg_config_path'].value + sysroot = self.env.properties[self.for_machine].get_sys_root() + if sysroot: + env['PKG_CONFIG_SYSROOT_DIR'] = sysroot new_pkg_config_path = ':'.join([p for p in extra_paths]) mlog.debug('PKG_CONFIG_PATH: ' + new_pkg_config_path) env['PKG_CONFIG_PATH'] = new_pkg_config_path + fenv = frozenset(env.items()) targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache |