meson: Allow user to override setup command options
PATCH v7 1/7 meson: Allow user to override setup command options
Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
From: Tom Hochstein <[email protected]>
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 -4
@@ -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 \ + "$@"
--
2.34.1
PATCH v7 2/7 toolchain-scripts: Add Meson settings for Yocto build SDK
Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
From: Tom Hochstein <[email protected]>
The Meson settings for the standalone SDK also need to be available for the Yocto build SDK, a.k.a. meta-ide-support.
--- meta/classes-recipe/toolchain-scripts.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes-recipe/toolchain-scripts.bbclass +2 -0
@@ -99,6 +99,8 @@ toolchain_create_tree_env_script () { echo 'export OECORE_BASELIB="${baselib}"' >> $script echo 'export OECORE_TARGET_ARCH="${TARGET_ARCH}"' >>$script echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script + echo 'export OECORE_TARGET_BITS="${@siteinfo_with_prefix(d, 'bit-')}"' >>$script + echo 'export OECORE_TARGET_ENDIAN="${@siteinfo_with_prefix(d, 'endian-')}"' >>$script toolchain_shared_env_script
--
2.34.1
PATCH v7 3/7 toolchain-scripts: Export meson settings for SDK builds
In reply toCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
From: Tom Hochstein <[email protected]>
Create a new set of exports for the Meson host_machine cross settings. This allows the target cross file to be created correctly from meson.cross.template and aligns with meson.bbclass.
Note, one might think that HOST_OS and HOST_ARCH would be appropriate as inputs here, aligning nicely with the Meson naming. That turns out to be incorrect since the script is generated in a native/nativesdk build with HOST_OS and HOST_ARCH set for the "build machine", not the "host machine", using the Meson terminology. See
https://mesonbuild.com/Cross-compilation.html.
--- meta/classes-recipe/toolchain-scripts.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
meta/classes-recipe/toolchain-scripts.bbclass +9 -1
@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit toolchain-scripts-base siteinfo kernel-arch +inherit toolchain-scripts-base siteinfo kernel-arch meson-routines # We want to be able to change the value of MULTIMACH_TARGET_SYS, because it # doesn't always match our expectations... but we default to the stock value
@@ -72,6 +72,10 @@ toolchain_create_sdk_env_script () { echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script echo 'export OECORE_TARGET_BITS="${@siteinfo_with_prefix(d, 'bit-')}"' >>$script echo 'export OECORE_TARGET_ENDIAN="${@siteinfo_with_prefix(d, 'endian-')}"' >>$script + echo 'export OECORE_MESON_HOST_SYSTEM="${@meson_operating_system('TARGET_OS', d)}"' >>$script + echo 'export OECORE_MESON_HOST_CPU_FAMILY="${@meson_cpu_family('TARGET_ARCH', d)}"' >>$script + echo 'export OECORE_MESON_HOST_CPU="${TARGET_ARCH}"' >>$script + echo 'export OECORE_MESON_HOST_ENDIAN="${@meson_endian('TARGET', d)}"' >>$script echo 'unset command_not_found_handle' >> $script
@@ -101,6 +105,10 @@ toolchain_create_tree_env_script () { echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script echo 'export OECORE_TARGET_BITS="${@siteinfo_with_prefix(d, 'bit-')}"' >>$script echo 'export OECORE_TARGET_ENDIAN="${@siteinfo_with_prefix(d, 'endian-')}"' >>$script + echo 'export OECORE_MESON_HOST_SYSTEM="${@meson_operating_system('TARGET_OS', d)}"' >>$script + echo 'export OECORE_MESON_HOST_CPU_FAMILY="${@meson_cpu_family('TARGET_ARCH', d)}"' >>$script + echo 'export OECORE_MESON_HOST_CPU="${TARGET_ARCH}"' >>$script + echo 'export OECORE_MESON_HOST_ENDIAN="${@meson_endian('TARGET', d)}"' >>$script toolchain_shared_env_script
--
2.34.1
PATCH v7 4/7 meson: Fix host_machine setting for native cross-file
In reply toCaution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button
From: Tom Hochstein <[email protected]>
For native and nativesdk, the meson cross-file settings for host_machine are incorrectly set for the build machine, not the "machine on which the compiled binary will run". See
https://mesonbuild.com/Cross-compilation.html.
--- meta/recipes-devtools/meson/meson_1.7.2.bb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
meta/recipes-devtools/meson/meson_1.7.2.bb +4 -12
@@ -107,18 +107,14 @@ needs_exe_wrapper = true sys_root = @OECORE_TARGET_SYSROOT [host_machine] -system = '$host_system' -cpu_family = '$host_cpu_family' -cpu = '$host_cpu' -endian = '$host_endian' +system = @OECORE_MESON_HOST_SYSTEM +cpu_family = @OECORE_MESON_HOST_CPU_FAMILY +cpu = @OECORE_MESON_HOST_CPU +endian = @OECORE_MESON_HOST_ENDIAN EOF } do_install:append:class-nativesdk() { - host_system=${SDK_OS} - host_cpu_family=${@meson_cpu_family("SDK_ARCH", d)} - host_cpu=${SDK_ARCH} - host_endian=${@meson_endian("SDK", d)} install_templates install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
@@ -132,10 +128,6 @@ do_install:append:class-nativesdk() { FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" do_install:append:class-native() { - host_system=${HOST_OS} - host_cpu_family=${@meson_cpu_family("HOST_ARCH", d)} - host_cpu=${HOST_ARCH} - host_endian=${@meson_endian("HOST", d)} install_templates install -d ${D}${datadir}/post-relocate-setup.d
--
2.34.1