The nativesdk-meson creates a shell wrapper which adds cross-file option to the meson command. This option causes problems because it is only uses for the setup command. If you use meson for testing like 'meson test' the cross-file option is discarded.
Signed-off-by: Christian Perkonig <[email protected]> --- meta/recipes-devtools/meson/meson/meson-wrapper | 14 -------------- .../meson/nativesdk-meson_0.55.1.bb | 6 +----- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100755 meta/recipes-devtools/meson/meson/meson-wrapper diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper deleted file mode 100755 index d4ffe60f9a..0000000000 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ -z "$OECORE_NATIVE_SYSROOT" ]; then - echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 -fi - -# If these are set to a cross-compile path, meson will get confused and try to -# use them as native tools. Unset them to prevent this, as all the cross-compile -# config is already in meson.cross. -unset CC CXX CPP LD AR NM STRIP - -exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ - --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ - "$@" diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb index 67add2c25e..3c8c4fbc37 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb @@ -3,8 +3,7 @@ include meson.inc inherit nativesdk inherit siteinfo -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" +SRC_URI += "file://meson-setup.py" def meson_endian(prefix, d): arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") @@ -51,9 +50,6 @@ EOF install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ - # We need to wrap the real meson with a thin env setup wrapper. - mv ${D}${bindir}/meson ${D}${bindir}/meson.real - install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson } RDEPENDS_${PN} += "\ -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142649): https://lists.openembedded.org/g/openembedded-core/message/142649 Mute This Topic: https://lists.openembedded.org/mt/76927520/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
