diff options
| author | Olexa Bilaniuk <obilaniu@gmail.com> | 2019-09-30 00:30:44 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-30 20:54:08 +0300 |
| commit | e32b0f8fbbd16b6cdd795a9a596eb56813620055 (patch) | |
| tree | 860b4d96a09c36507239ed4e13337d709efde2a8 | |
| parent | 2057ffccc3516b82d8ea9ea3f5ac0a86fd6ca035 (diff) | |
| download | meson-e32b0f8fbbd16b6cdd795a9a596eb56813620055.zip meson-e32b0f8fbbd16b6cdd795a9a596eb56813620055.tar.gz meson-e32b0f8fbbd16b6cdd795a9a596eb56813620055.tar.bz2 | |
Deduplicate PKG_CONFIG_PATH entries when initializing the array option pkg_config_path.
This avoids a warning about duplicate entries in an array option,
and closes #5736.
| -rw-r--r-- | mesonbuild/coredata.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 0a541cc..c7fbf54 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -718,7 +718,13 @@ class CoreData: if env.first_invocation: p_env = os.environ.get('PKG_CONFIG_PATH') if p_env: - options['pkg_config_path'] = p_env.split(':') + # PKG_CONFIG_PATH may contain duplicates, which must be + # removed, else a duplicates-in-array-option warning arises. + pkg_config_paths = [] + for k in p_env.split(':'): + if k not in pkg_config_paths: + pkg_config_paths.append(k) + options['pkg_config_path'] = pkg_config_paths for k, v in env.cmd_line_options.items(): if subproject: |