diff options
| author | Tristan Partin <tristan@partin.io> | 2022-03-08 14:27:20 -0600 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-03-09 17:50:41 -0500 |
| commit | 2c03b2bb7f4a292094b9b53f6214686503137141 (patch) | |
| tree | 6034575610a4e30b741b3bbf18f89d6cfa46e3af /mesonbuild/modules | |
| parent | 266e8acb5807b38a550cb5145cea0e19545a21d7 (diff) | |
| download | meson-2c03b2bb7f4a292094b9b53f6214686503137141.zip meson-2c03b2bb7f4a292094b9b53f6214686503137141.tar.gz meson-2c03b2bb7f4a292094b9b53f6214686503137141.tar.bz2 | |
Move dataonly pkgconfig file to datadir/pkgconfig
dataonly files are architecture independent (lib vs lib64 for example).
Fixes #9902
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index f67e6eb..0eac360 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -524,6 +524,7 @@ class PkgConfigModule(ExtensionModule): blocked_vars = ['libraries', 'libraries_private', 'require_private', 'extra_cflags', 'subdirs'] if any(k in kwargs for k in blocked_vars): raise mesonlib.MesonException(f'Cannot combine dataonly with any of {blocked_vars}') + default_install_dir = os.path.join(state.environment.get_datadir(), 'pkgconfig') subdirs = mesonlib.stringlistify(kwargs.get('subdirs', default_subdirs)) version = kwargs.get('version', default_version) |