From 0047f7439c6bafe964438e2c59a3686201ff24c0 Mon Sep 17 00:00:00 2001 From: Jeff Moguillansky Date: Fri, 26 Feb 2021 11:54:32 -0800 Subject: pkg-config: dump all PKG_CONFIG environment variables to simplify debugging With this change, all the system's built-in pkg-config environment variables are outputted as well, to simplify debugging. --- mesonbuild/dependencies/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index cd77b4b..bd94648 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -676,14 +676,16 @@ class PkgConfigDependency(ExternalDependency): 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 pkg_config_libdir_prop = environment.properties[for_machine].get_pkg_config_libdir() if pkg_config_libdir_prop: new_pkg_config_libdir = ':'.join([p for p in pkg_config_libdir_prop]) env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir - mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) + # Dump all PKG_CONFIG environment variables + for key, value in env.items(): + if key.startswith('PKG_'): + mlog.debug(f'env[{key}]: {value}') def _call_pkgbin(self, args, env=None): # Always copy the environment since we're going to modify it -- cgit v1.1