The meson-wrapper adds setup options to facilitate cross-compilation.
The current options are exclusive to the setup sub-command and might
cause issues with other sub-commands.
Update the wrapper to make options sub-command specific.
Signed-off-by: Liam Beguin <liambeg...@gmail.com>
---
.../meson/meson/meson-wrapper | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper
b/meta/recipes-devtools/meson/meson/meson-wrapper
index c62007f5077e..fae9e167a325 100755
--- a/meta/recipes-devtools/meson/meson/meson-wrapper
+++ b/meta/recipes-devtools/meson/meson/meson-wrapper
@@ -13,7 +13,23 @@ fi
# config is already in meson.cross.
unset CC CXX CPP LD AR NM STRIP
+for arg in "${@}"; do
+ case ${arg} in
+ -*) continue ;;
+ *) SUBCMD=${arg}; break ;;
+ esac
+done
+
+case ${SUBCMD} in
+setup)
+ MESON_SUB_OPTS=" \
+
--cross-file="${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross"
\
+ --native-file="${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \
+ "
+ ;;
+esac
+
exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \
- --cross-file
"${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \
- --native-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \
- "$@"
+ ${SUBCMD} \
+ ${MESON_SUB_OPTS} \
+ $(echo $@ | sed s/${SUBCMD}//)
base-commit: 09c1cac053c2892e3af3250cc6229e8da78e7a50
--
2.37.1.223.g6a475b71f8c4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170842):
https://lists.openembedded.org/g/openembedded-core/message/170842
Mute This Topic: https://lists.openembedded.org/mt/93751917/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
