mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/meson: Sync with Gentoo

Browse Source 
It's from Gentoo commit 1186dced6c900242bfa70151030fd3463eb20717.
This commit is contained in:
Flatcar Buildbot 2024-01-01 07:13:04 +00:00 committed by Krzesimir Nowak
parent 3d09b0a0e2
commit 32ff0491d6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/portage-stable/eclass/meson.eclass vendored
View File

@ -161,7 +161,10 @@ _meson_create_cross_file() {
objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
objcopy = $(_meson_env_array "$(tc-getOBJCOPY)") objcopy = $(_meson_env_array "$(tc-getOBJCOPY)")
objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") 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)' pkgconfig = '$(tc-getPKG_CONFIG)'
pkg-config = '$(tc-getPKG_CONFIG)'
strip = $(_meson_env_array "$(tc-getSTRIP)") strip = $(_meson_env_array "$(tc-getSTRIP)")
windres = $(_meson_env_array "$(tc-getRC)") windres = $(_meson_env_array "$(tc-getRC)")
@ -215,7 +218,10 @@ _meson_create_native_file() {
objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)") objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)")
objcopy = $(_meson_env_array "$(tc-getBUILD_OBJCOPY)") objcopy = $(_meson_env_array "$(tc-getBUILD_OBJCOPY)")
objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)") 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)' pkgconfig = '$(tc-getBUILD_PKG_CONFIG)'
pkg-config = '$(tc-getBUILD_PKG_CONFIG)'
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")