diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-27 22:51:10 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-27 22:51:10 +0000 |
| commit | ee0c4d5e506a6c64994a15c3af5cf1ca22045567 (patch) | |
| tree | bdf578939023d42f04092ddb4bcd190eb391770f /eclass | |
| parent | 161eaa4b12ca6314376288834bba20b7824d0d77 (diff) | |
gentoo auto-resync : 27:11:2023 - 22:51:09
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38932 -> 38937 bytes | |||
| -rw-r--r-- | eclass/meson.eclass | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex a2e4ef016fbd..3d0deed4f80c 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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)") |