From: Randy Li <ayaka@soulik.info>
Date: Tue, 29 Dec 2020 03:55:49 +0000 (+0800)
Subject: meson: Don't turn string into a list in nativesdk
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~9118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68f20ac5524a5db8a09a90df796b4862cf747d3c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

meson: Don't turn string into a list in nativesdk

In the current version of meson, some path variables only
accept a string not a list.

Signed-off-by: Randy Li <ayaka@soulik.info>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/meson/meson/meson-setup.py b/meta/recipes-devtools/meson/meson/meson-setup.py
index 808e2a062f6..7ac4e3ad471 100755
--- a/meta/recipes-devtools/meson/meson/meson-setup.py
+++ b/meta/recipes-devtools/meson/meson/meson-setup.py
@@ -10,9 +10,13 @@ class Template(string.Template):
 class Environ():
     def __getitem__(self, name):
         val = os.environ[name]
-        val = ["'%s'" % x for x in val.split()]
-        val = ', '.join(val)
-        val = '[%s]' % val
+        val = val.split()
+        if len(val) > 1:
+            val = ["'%s'" % x for x in val]
+            val = ', '.join(val)
+            val = '[%s]' % val
+        elif val:
+            val = "'%s'" % val.pop()
         return val
 
 try: