diff options
author | Randy Li <ayaka@soulik.info> | 2020-12-29 11:55:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-12 17:47:20 +0000 |
commit | 66d4b8ad1b99f42464136993bfcb3cb5cfd35442 (patch) | |
tree | f577466114b25591d8d5ad324913d184f1e0774d /meta/recipes-devtools | |
parent | e1d6b3fbcb164a873540a3a817fe2df6bd6fdaed (diff) | |
download | poky-66d4b8ad1b99f42464136993bfcb3cb5cfd35442.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.
(From OE-Core rev: 68f20ac5524a5db8a09a90df796b4862cf747d3c)
Signed-off-by: Randy Li <ayaka@soulik.info>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rwxr-xr-x | meta/recipes-devtools/meson/meson/meson-setup.py | 10 |
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): | |||
10 | class Environ(): | 10 | class Environ(): |
11 | def __getitem__(self, name): | 11 | def __getitem__(self, name): |
12 | val = os.environ[name] | 12 | val = os.environ[name] |
13 | val = ["'%s'" % x for x in val.split()] | 13 | val = val.split() |
14 | val = ', '.join(val) | 14 | if len(val) > 1: |
15 | val = '[%s]' % val | 15 | val = ["'%s'" % x for x in val] |
16 | val = ', '.join(val) | ||
17 | val = '[%s]' % val | ||
18 | elif val: | ||
19 | val = "'%s'" % val.pop() | ||
16 | return val | 20 | return val |
17 | 21 | ||
18 | try: | 22 | try: |