summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRandy Li <ayaka@soulik.info>2020-12-29 11:55:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-12 17:47:16 +0000
commit68f20ac5524a5db8a09a90df796b4862cf747d3c (patch)
treeab39039c38792a1b320fae4d8f38a7ca57119e7f /meta
parent4ac692422526a2924602df410d7562b31d36c0ae (diff)
downloadopenembedded-core-68f20ac5524a5db8a09a90df796b4862cf747d3c.tar.gz
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>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-devtools/meson/meson/meson-setup.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-devtools/meson/meson/meson-setup.py b/meta/recipes-devtools/meson/meson/meson-setup.py
index 808e2a062f..7ac4e3ad47 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: