MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: Fix host_machine setting for native cross-file

Browse Source 
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)

(From OE-Core rev: 0b882df19b5c339d2e7e00f56136afa890404f7b)

Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Hochstein 2025-05-10 09:43:53 +01:00 committed by Richard Purdie
parent 12bcad4ea5
commit e07389d1be
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta/recipes-devtools/meson/meson_1.8.0.bb
View File

@ -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