From ebb0f1e390814a2ccd647558cca7ba22037cf373 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 12 Jul 2024 13:49:04 +0100 Subject: [PATCH] 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. (From OE-Core rev: 7c2b573e6cbe518f54ea5c3539fc91ed63b80ebf) Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson_1.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/meson/meson_1.4.0.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb index 5db100ff1c..a0c2ee633a 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}',