diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-07-03 18:31:46 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-07-15 20:52:27 +0300 |
| commit | 9e37c8a308db3300f9f5f91ea4da0ccd86f195b1 (patch) | |
| tree | ce5cff2ebdd484e2bec03dc2466248f69e39276d | |
| parent | 7217620e23db78ed832e3e81b1deb54b5f28b0ed (diff) | |
| download | meson-9e37c8a308db3300f9f5f91ea4da0ccd86f195b1.zip meson-9e37c8a308db3300f9f5f91ea4da0ccd86f195b1.tar.gz meson-9e37c8a308db3300f9f5f91ea4da0ccd86f195b1.tar.bz2 | |
Warn if PKG_CONFIG_PATH has changed because it may cause dependency detection to fail. Closes #626.
| -rw-r--r-- | mesonbuild/coredata.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 21b907e..dc7973e 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -133,6 +133,8 @@ class CoreData(): self.cross_compilers = {} self.deps = {} self.modules = {} + # Only to print a warning if it changes between Meson invocations. + self.pkgconf_envvar = os.environ.get('PKG_CONFIG_PATH', '') def init_builtins(self, options): self.builtins = {} diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 737352e..e61c602 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -117,6 +117,13 @@ itself as required.''' raise RuntimeError('Something went terribly wrong. Please file a bug.') return (src_dir, build_dir) + def check_pkgconfig_envvar(self, env): + curvar = os.environ.get('PKG_CONFIG_PATH', '') + if curvar != env.coredata.pkgconf_envvar: + mlog.log(mlog.red("WARNING:"), 'PKG_CONFIG_PATH has changed between invocations from "%s" to "%s".' % + (env.coredata.pkgconf_envvar, curvar)) + env.coredata.pkgconf_envvar = curvar + def generate(self): env = environment.Environment(self.source_dir, self.build_dir, self.meson_script_file, self.options, self.original_cmd_line_args) mlog.initialize(env.get_log_dir()) @@ -124,6 +131,7 @@ itself as required.''' mlog.debug('Python binary:', sys.executable) mlog.debug('Python system:', platform.system()) mlog.log(mlog.bold('The Meson build system')) + self.check_pkgconfig_envvar(env) mlog.log('Version:', coredata.version) mlog.log('Source dir:', mlog.bold(self.source_dir)) mlog.log('Build dir:', mlog.bold(self.build_dir)) |