From 66d4b8ad1b99f42464136993bfcb3cb5cfd35442 Mon Sep 17 00:00:00 2001 From: Randy Li Date: Tue, 29 Dec 2020 11:55:49 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson/meson-setup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools') 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: -- cgit v1.2.3-54-g00ecf