Skip to contentSkip to conversation

meson: Allow user to override setup command options

PATCH Tom Hochstein 1 participant 1 message Mar 29, 2025 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

Oops, please ignore this one.

Quoted 51 lines · Tom Hochstein via lists.openembedded.org

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.

---
  meta/recipes-devtools/meson/meson/meson-wrapper | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
meta/recipes-devtools/meson/meson/meson-wrapper +11 -5
index 7455985297..3aa1a93520 100755
@@ -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 \
+    "$@"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#213888): https://lists.openembedded.org/g/openembedded-core/message/213888
Mute This Topic: https://lists.openembedded.org/mt/111974936/3617670
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-