diff options
| author |   Sam James <sam@gentoo.org> | 2023-11-27 01:33:34 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-11-27 11:12:55 +0000 |
| commit | 1186dced6c900242bfa70151030fd3463eb20717 (patch) | |
| tree | 99331c8afb373a4ab080e793a1dadaba6e0d2200 /eclass/meson.eclass | |
| parent | media-radio/chirp: add 20231125, drop 20231123 (diff) | |
| download | gentoo-1186dced6c900242bfa70151030fd3463eb20717.tar.gz gentoo-1186dced6c900242bfa70151030fd3463eb20717.tar.bz2 gentoo-1186dced6c900242bfa70151030fd3463eb20717.zip | |
meson.eclass: update machine files for meson-1.3.0 deprecation
See https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig.
'pkgconfig' is deprecated as a key in machine files in favour of 'pkg-config'.
We can define both 'pkgconfig' and 'pkg-config' in our generated machine files
until we require >=1.3.0. Per the release notes, if we define both, no deprecation
notice is emitted, so do that.
Reviewed-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index c33f4ea208a7..f7cf8a0722ba 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -161,7 +161,10 @@ _meson_create_cross_file() { objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") objcopy = $(_meson_env_array "$(tc-getOBJCOPY)") objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") + # TODO: Cleanup 'pkgconfig' and keep just 'pkg-config' once we require + # >=1.3.0. pkgconfig = '$(tc-getPKG_CONFIG)' + pkg-config = '$(tc-getPKG_CONFIG)' strip = $(_meson_env_array "$(tc-getSTRIP)") windres = $(_meson_env_array "$(tc-getRC)") @@ -215,7 +218,10 @@ _meson_create_native_file() { objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)") objcopy = $(_meson_env_array "$(tc-getBUILD_OBJCOPY)") objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)") + # TODO: Cleanup 'pkgconfig' and keep just 'pkg-config' once we require + # >=1.3.0. pkgconfig = '$(tc-getBUILD_PKG_CONFIG)' + pkg-config = '$(tc-getBUILD_PKG_CONFIG)' strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |