aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo@ribalda.com>2019-06-19 11:42:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-19 13:15:55 +0100
commitf7a470531d4bcc2888cbb9a7b197b86174f3aba2 (patch)
tree34da77826d20e775efa1705498680c8af5ebdf0c
parent3e09c8b5b6517da97a9ec0ce5deb4ba1b066d19b (diff)
downloadopenembedded-core-contrib-f7a470531d4bcc2888cbb9a7b197b86174f3aba2.tar.gz
openembedded-core-contrib-f7a470531d4bcc2888cbb9a7b197b86174f3aba2.tar.bz2
openembedded-core-contrib-f7a470531d4bcc2888cbb9a7b197b86174f3aba2.zip
meson: Fix native patch to python3
Fixes: File "/workdir/build/tmp/work/dbfp4-poky-linux/qv4l2/1.17.0+gitAUTOINC+95f39aae48-r0/recipe-sysroot-native/usr/lib/python3.7/site-packages/mesonbuild/dependencies/base.py", line 574, in _call_pkgbin cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) File "/workdir/build/tmp/work/dbfp4-poky-linux/qv4l2/1.17.0+gitAUTOINC+95f39aae48-r0/recipe-sysroot-native/usr/lib/python3.7/site-packages/mesonbuild/dependencies/base.py", line 556, in _call_pkgbin_real cmd = self.pkgbin.get_command() + "-native" + args TypeError: can only concatenate list (not "str") to list Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index da477454cb6..2b22531dd0c 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -51,7 +51,7 @@ index 6d3678f..90fdb80 100644
- cmd = self.pkgbin.get_command() + args
+ def _call_pkgbin_real(self, args, env, use_native=False):
+ if use_native:
-+ cmd = self.pkgbin.get_command() + "-native" + args
++ cmd = [self.pkgbin.get_command()[0] + "-native"] + args
+ else:
+ cmd = self.pkgbin.get_command() + args
p, out = Popen_safe(cmd, env=env)[0:2]