summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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 22:13:42 +0100
commita935d4ce3b77bf7471455e068f46d3f9e4322a35 (patch)
treedfc22d8b8317fcdc3b13dba1b3a30dd9675d247a /meta/recipes-devtools
parentde7a2d26ec12facbef1d5a92922b4136ee803aaf (diff)
downloadpoky-a935d4ce3b77bf7471455e068f46d3f9e4322a35.tar.gz
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 (From OE-Core rev: f7a470531d4bcc2888cbb9a7b197b86174f3aba2) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 da477454cb..2b22531dd0 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
51- cmd = self.pkgbin.get_command() + args 51- cmd = self.pkgbin.get_command() + args
52+ def _call_pkgbin_real(self, args, env, use_native=False): 52+ def _call_pkgbin_real(self, args, env, use_native=False):
53+ if use_native: 53+ if use_native:
54+ cmd = self.pkgbin.get_command() + "-native" + args 54+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args
55+ else: 55+ else:
56+ cmd = self.pkgbin.get_command() + args 56+ cmd = self.pkgbin.get_command() + args
57 p, out = Popen_safe(cmd, env=env)[0:2] 57 p, out = Popen_safe(cmd, env=env)[0:2]