From e32b0f8fbbd16b6cdd795a9a596eb56813620055 Mon Sep 17 00:00:00 2001 From: Olexa Bilaniuk Date: Mon, 30 Sep 2019 00:30:44 -0400 Subject: [PATCH] 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. --- mesonbuild/coredata.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 0a541ccd3..c7fbf540b 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: