From 75436b4047b160ff1810253a83e52a07303e2103 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 17 Apr 2025 13:08:28 -0500 Subject: [PATCH] meson: Allow user to override setup command options 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson/meson-wrapper | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index 7455985297..3aa1a93520 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -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 \ + "$@"