diff options
| author | Ricardo Ribalda Delgado <ricardo@ribalda.com> | 2019-06-19 11:42:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-08 22:51:35 +0100 |
| commit | ee1ab63ef30d88513335322039bc8bcc4c7ae611 (patch) | |
| tree | 30d7e5afc8fecdbfaa8f54be6c01590c14662a34 | |
| parent | cf840f4e0cf2a8a11f2dec9bd73458f45e123841 (diff) | |
| download | poky-ee1ab63ef30d88513335322039bc8bcc4c7ae611.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: 9051c10e46960a357f0339e347618f5d83923fe4)
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 2 |
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] |