From: Ross Burton <ross.burton@arm.com>
Date: Sat, 10 May 2025 08:43:55 +0000 (+0100)
Subject: meson: remove sysroot from the native environment file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ac60779d3f392689bad25780974244f893e2a0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

meson: remove sysroot from the native environment file

The [properties]sys_root assignment doesn't actually do much in cross
builds, and does nothing in native builds (confirmed by the Meson
author).

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/meson/meson_1.8.0.bb b/meta/recipes-devtools/meson/meson_1.8.0.bb
index 1d1011597b..5d4fc39751 100644
--- a/meta/recipes-devtools/meson/meson_1.8.0.bb
+++ b/meta/recipes-devtools/meson/meson_1.8.0.bb
@@ -83,9 +83,6 @@ c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2s
 c_link_args = ${@generate_native_link_template(d)}
 cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
 cpp_link_args = ${@generate_native_link_template(d)}
-
-[properties]
-sys_root = '@OECORE_NATIVE_SYSROOT'
 EOF
 }