| Brad Bishop | 2f97392 | 2019-11-11 07:58:48 -0500 | [diff] [blame^] | 1 | From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Mon, 4 Nov 2019 19:19:47 +0100 |
| 4 | Subject: [PATCH] meson.build: do not ask for python installation / version |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Even by adding python3-setuptools-native the following error is not fixed so |
| 10 | just ask for python3 executable. |
| 11 | |
| 12 | | meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools |
| 13 | |
| 14 | Upstream-Status: Inappropriate [OE specific] |
| 15 | |
| 16 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 17 | --- |
| 18 | meson.build | 7 +------ |
| 19 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 20 | |
| 21 | diff --git a/meson.build b/meson.build |
| 22 | index 3255328..7a6094c 100644 |
| 23 | --- a/meson.build |
| 24 | +++ b/meson.build |
| 25 | @@ -6,12 +6,7 @@ project('mm-common', |
| 26 | license: 'GPLv2+' |
| 27 | ) |
| 28 | |
| 29 | -python3 = import('python').find_installation('python3') |
| 30 | -python_version = python3.language_version() |
| 31 | -python_version_req = '>= 3.5' |
| 32 | -if not python_version.version_compare(python_version_req) |
| 33 | - error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) |
| 34 | -endif |
| 35 | +python3 = import('python3').find_python() |
| 36 | |
| 37 | # Use these instead of meson.source_root() and meson.build_root(). |
| 38 | # source_root() and build_root() are not useful, if this is a subproject. |
| 39 | -- |
| 40 | 2.21.0 |
| 41 | |