mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 22:16:58 +02:00
eclass/meson: Sync with Gentoo
It's from Gentoo commit afe0521495aeed0a22a3656e7bad193fba39805e.
This commit is contained in:
parent
afce005187
commit
91f2df49e1
@ -425,7 +425,10 @@ meson_src_configure() {
|
||||
export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH}
|
||||
echo meson setup "${MESONARGS[@]}" >&2
|
||||
meson setup "${MESONARGS[@]}"
|
||||
) || die -n
|
||||
)
|
||||
local rv=$?
|
||||
[[ ${rv} -eq 0 ]] || die -n "configure failed"
|
||||
return ${rv}
|
||||
}
|
||||
|
||||
# @FUNCTION: meson_src_compile
|
||||
@ -451,9 +454,12 @@ meson_src_compile() {
|
||||
|
||||
set -- meson compile "${mesoncompileargs[@]}"
|
||||
echo "$@" >&2
|
||||
"$@" || die -n "compile failed"
|
||||
"$@"
|
||||
local rv=$?
|
||||
[[ ${rv} -eq 0 ]] || die -n "compile failed"
|
||||
|
||||
popd > /dev/null || die
|
||||
return ${rv}
|
||||
}
|
||||
|
||||
# @FUNCTION: meson_src_test
|
||||
@ -473,9 +479,12 @@ meson_src_test() {
|
||||
|
||||
set -- meson test "${mesontestargs[@]}"
|
||||
echo "$@" >&2
|
||||
"$@" || die -n "tests failed"
|
||||
"$@"
|
||||
local rv=$?
|
||||
[[ ${rv} -eq 0 ]] || die -n "tests failed"
|
||||
|
||||
popd > /dev/null || die
|
||||
return ${rv}
|
||||
}
|
||||
|
||||
# @FUNCTION: meson_install
|
||||
@ -495,9 +504,12 @@ meson_install() {
|
||||
|
||||
set -- meson install "${mesoninstallargs[@]}"
|
||||
echo "$@" >&2
|
||||
"$@" || die -n "install failed"
|
||||
"$@"
|
||||
local rv=$?
|
||||
[[ ${rv} -eq 0 ]] || die -n "install failed"
|
||||
|
||||
popd > /dev/null || die
|
||||
return ${rv}
|
||||
}
|
||||
|
||||
# @FUNCTION: meson_src_install
|
||||
|
Loading…
Reference in New Issue
Block a user