]> code.ossystems Code Review - openembedded-core.git/commitdiff
meson: Don't turn string into a list in nativesdk
authorRandy Li <ayaka@soulik.info>
Tue, 29 Dec 2020 03:55:49 +0000 (11:55 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 12 Jan 2021 17:47:16 +0000 (17:47 +0000)
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>
meta/recipes-devtools/meson/meson/meson-setup.py

index 808e2a062f66e7fdb89f0c1a97a4c27352bd8932..7ac4e3ad471a3738a40f8315e609e56cbda3cbb6 100755 (executable)
@@ -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: