blob: 4866a5fbe074a69722fbf719b488ed9c13367989 [file] [log] [blame]
Brad Bishop2f973922019-11-11 07:58:48 -05001From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 4 Nov 2019 19:19:47 +0100
4Subject: [PATCH] meson.build: do not ask for python installation / version
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Even by adding python3-setuptools-native the following error is not fixed so
10just 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
Patrick Williamsb9af8752023-01-30 13:28:01 -060014Upstream-Status: Inappropriate [OE specific]
Brad Bishop2f973922019-11-11 07:58:48 -050015
16Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000017
18rebase for 1.0.4
19Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
20
Brad Bishop2f973922019-11-11 07:58:48 -050021---
22 meson.build | 7 +------
23 1 file changed, 1 insertion(+), 6 deletions(-)
24
25diff --git a/meson.build b/meson.build
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000026index 8a18c36..34fd546 100644
Brad Bishop2f973922019-11-11 07:58:48 -050027--- a/meson.build
28+++ b/meson.build
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000029@@ -7,12 +7,7 @@ project('mm-common',
30 # and meson.add_install_script(python3, ...)
Brad Bishop2f973922019-11-11 07:58:48 -050031 )
32
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000033-python3 = import('python').find_installation()
Brad Bishop2f973922019-11-11 07:58:48 -050034-python_version = python3.language_version()
35-python_version_req = '>= 3.5'
36-if not python_version.version_compare(python_version_req)
37- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version))
38-endif
39+python3 = import('python3').find_python()
40
41 # Use these instead of meson.source_root() and meson.build_root().
42 # source_root() and build_root() are not useful, if this is a subproject.
43--
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000442.25.1
Brad Bishop2f973922019-11-11 07:58:48 -050045