From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 12 Jul 2024 12:49:04 +0000 (+0100)
Subject: meson: Fix native meson config
X-Git-Tag: uninative-4.6~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c2b573e6cbe518f54ea5c3539fc91ed63b80ebf;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

meson: Fix native meson config

When the optimization flags were reduced to a single option, a different
and clearly untested codepath was used where the output was unquoted. This
caused errors when testing meson in the SDK.

Use repr() in the single item case as per the multiple item case to correctly
quote the output and fix build failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/meson/meson_1.4.0.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb
index 5db100ff1cd..a0c2ee633ae 100644
--- a/meta/recipes-devtools/meson/meson_1.4.0.bb
+++ b/meta/recipes-devtools/meson/meson_1.4.0.bb
@@ -47,7 +47,7 @@ inherit meson-routines
 #   them.
 def var_list2str(var, d):
     items = d.getVar(var).split()
-    return items[0] if len(items) == 1 else ', '.join(repr(s) for s in items)
+    return repr(items[0]) if len(items) == 1 else ', '.join(repr(s) for s in items)
 
 def generate_native_link_template(d):
     val = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}',