diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-08-18 12:58:18 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-18 13:51:27 -0400 |
| commit | 6a56f6d98fb7806a59967b0df3ede26544eac4a4 (patch) | |
| tree | 18e607e083bbc00ea341333a0b55e543e28986af /mesonbuild/envconfig.py | |
| parent | 0eae4e0936181b7f89d73fcb15d752cdf1bea05a (diff) | |
| download | meson-6a56f6d98fb7806a59967b0df3ede26544eac4a4.tar.gz | |
pkgconfig: Deprecate "pkgconfig" in favor of "pkg-config" in [binaries]
Diffstat (limited to 'mesonbuild/envconfig.py')
| -rw-r--r-- | mesonbuild/envconfig.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 5340521c3..c6b543a34 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -133,7 +133,6 @@ ENV_VAR_TOOL_MAP: T.Mapping[str, str] = { # Other tools 'cmake': 'CMAKE', 'qmake': 'QMAKE', - 'pkgconfig': 'PKG_CONFIG', 'pkg-config': 'PKG_CONFIG', 'make': 'MAKE', 'vapigen': 'VAPIGEN', @@ -403,6 +402,11 @@ class BinaryTable: if not isinstance(command, (list, str)): raise mesonlib.MesonException( f'Invalid type {command!r} for entry {name!r} in cross file') + if name == 'pkgconfig': + if 'pkg-config' in binaries: + raise mesonlib.MesonException('Both pkgconfig and pkg-config entries in machine file.') + mlog.deprecation('"pkgconfig" entry is deprecated and should be replaced by "pkg-config"') + name = 'pkg-config' self.binaries[name] = mesonlib.listify(command) @staticmethod |