From 0b882df19b5c339d2e7e00f56136afa890404f7b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sat, 10 May 2025 09:43:53 +0100 Subject: [PATCH] meson: Fix host_machine setting for native cross-file 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. Fixes: [YOCTO #15485] (From OE-Core rev: 59d21632aecf1ca9085d17aeda19a8a29602cd17) Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson_1.8.0.bb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/meson/meson_1.8.0.bb b/meta/recipes-devtools/meson/meson_1.8.0.bb index 6e3886e0a5..eb88890cd7 100644 --- a/meta/recipes-devtools/meson/meson_1.8.0.bb +++ b/meta/recipes-devtools/meson/meson_1.8.0.bb @@ -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.47.3