diff options
author | Liam Beguin <liambeguin@gmail.com> | 2022-09-28 22:50:56 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-09 17:42:08 +0000 |
commit | 7c28b18ba7d9f862bf756693c09036af4c27b370 (patch) | |
tree | f6ef9d37fee67499360f0778c944b69170e12990 | |
parent | 2d4e9d0d5b2018bcea869905a1a5742bb1f52d90 (diff) | |
download | poky-7c28b18ba7d9f862bf756693c09036af4c27b370.tar.gz |
meson: make wrapper options sub-command specific
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.
(From OE-Core rev: 6f4764ae2ef06c54dbbf77bcbf07af9390a565c9)
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 7bcda141f2019862b4fb5d8dec7956cd8344b420)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-devtools/meson/meson/meson-wrapper | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index 8fafaad975..b65ba8e803 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper | |||
@@ -5,7 +5,7 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then | |||
5 | fi | 5 | fi |
6 | 6 | ||
7 | if [ -z "$SSL_CERT_DIR" ]; then | 7 | if [ -z "$SSL_CERT_DIR" ]; then |
8 | export SSL_CERT_DIR="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/" | 8 | export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/etc/ssl/certs/" |
9 | fi | 9 | fi |
10 | 10 | ||
11 | # If these are set to a cross-compile path, meson will get confused and try to | 11 | # If these are set to a cross-compile path, meson will get confused and try to |
@@ -13,7 +13,20 @@ fi | |||
13 | # config is already in meson.cross. | 13 | # config is already in meson.cross. |
14 | unset CC CXX CPP LD AR NM STRIP | 14 | unset CC CXX CPP LD AR NM STRIP |
15 | 15 | ||
16 | for arg in "$@"; do | ||
17 | case "$arg" in | ||
18 | -*) continue ;; | ||
19 | *) SUBCMD="$arg"; break ;; | ||
20 | esac | ||
21 | done | ||
22 | |||
23 | if [ "$SUBCMD" = "setup" ] || [ -d "$SUBCMD" ]; then | ||
24 | MESON_SUB_OPTS=" \ | ||
25 | --cross-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/${TARGET_PREFIX}meson.cross" \ | ||
26 | --native-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.native" \ | ||
27 | " | ||
28 | fi | ||
29 | |||
16 | exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ | 30 | exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ |
17 | --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ | 31 | "$@" \ |
18 | --native-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \ | 32 | $MESON_SUB_OPTS |
19 | "$@" | ||