diff options
| author | Fini Jastrow <ulf.fini.jastrow@desy.de> | 2020-03-09 12:28:53 +0100 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-03-09 09:10:06 -0400 |
| commit | b74576953533e8f978f04ffce9c38cbfd6b2d68a (patch) | |
| tree | 409e656c7877d9883aa1c8ecd6ddf961611eb836 | |
| parent | 5c51d4521ab37edce88c61fd5067c93a44078854 (diff) | |
| download | meson-b74576953533e8f978f04ffce9c38cbfd6b2d68a.zip meson-b74576953533e8f978f04ffce9c38cbfd6b2d68a.tar.gz meson-b74576953533e8f978f04ffce9c38cbfd6b2d68a.tar.bz2 | |
pkgconfig: Document conflicts keyword
[why]
Sometimes one want to set the 'Conflicts:' field in .pc files.
This is possible by using the 'conflicts' keyword argument in the
pkgconfig module. The feature is not documented on mesonbuild.org,
though.
But a warning is issued:
WARNING: Passed invalid keyword argument "conflicts".
WARNING: This will become a hard error in the future.
History:
It has been added along with kwarg 'url' with commit
309041918 pkgconfig: Add missing 'URL' and 'Conflicts' entries
Later the kwargs check has been introduced with
80d665e8d Converted some modules.
but both 'url' and 'conflicts' were missing.
With commit
2acf737b pkgconfig: Document url keyword
the 'url' kwarg has been added to the checks, but not 'conflicts'.
[how]
Add 'conflicts' to the allowed kwargs.
Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
| -rw-r--r-- | docs/markdown/Pkgconfig-module.md | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/markdown/Pkgconfig-module.md b/docs/markdown/Pkgconfig-module.md index 13fc4e6..2497fd9 100644 --- a/docs/markdown/Pkgconfig-module.md +++ b/docs/markdown/Pkgconfig-module.md @@ -58,6 +58,7 @@ keyword arguments. generating the uninstalled pkg-config file. Since *0.54.0* - `dataonly` field. (*since 0.54.0*) this is used for architecture-independent pkg-config files in projects which also have architecture-dependent outputs. +- `conflicts` (*since 0.36.0, incorrectly issued a warning prior to 0.54.0*) list of strings to be put in the `Conflicts` field. Since 0.46 a `StaticLibrary` or `SharedLibrary` object can optionally be passed as first positional argument. If one is provided a default value will be diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 1d8e8a9..666a93d 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -392,7 +392,7 @@ class PkgConfigModule(ExtensionModule): @permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase', 'subdirs', 'requires', 'requires_private', 'libraries_private', 'install_dir', 'extra_cflags', 'variables', 'url', 'd_module_versions', - 'dataonly'}) + 'dataonly', 'conflicts'}) def generate(self, state, args, kwargs): if 'variables' in kwargs: FeatureNew('custom pkgconfig variables', '0.41.0').use(state.subproject) |