yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 23:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: Allow user to override setup command options

Browse Source 
The user cannot override the setup command options --cross-file and
--native-file because the meson-wrapper places these options on the
command line after the user options. This problem was noticed when
trying to build with an SDK using a custom cross-file.

(From OE-Core rev: 045a53349a5c00b318feb7029470d3fb084b61c8)

Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Hochstein 2025-04-17 13:08:28 -05:00 committed by Richard Purdie
parent 0a4d64647d
commit 75436b4047
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta/recipes-devtools/meson/meson/meson-wrapper
View File

@ -14,8 +14,14 @@ fi
unset CC CXX CPP LD AR NM STRIP
case "$1" in
setup|configure|dist|install|introspect|init|test|wrap|subprojects|rewrite|compile|devenv|env2mfile|help) MESON_CMD="$1" ;;
*) echo meson-wrapper: Implicit setup command assumed; MESON_CMD=setup ;;
setup|configure|dist|install|introspect|init|test|wrap|subprojects|rewrite|compile|devenv|env2mfile|help)
MESON_CMD="$1"
shift
;;
*)
MESON_CMD=setup
echo meson-wrapper: Implicit setup command assumed
;;
esac
if [ "$MESON_CMD" = "setup" ]; then
@ -27,5 +33,6 @@ if [ "$MESON_CMD" = "setup" ]; then
fi
exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \
"$@" \
$MESON_SETUP_OPTS
$MESON_CMD \
$MESON_SETUP_OPTS \
"$@"