mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
mm-common: do really build with meson
* to activate meson 'GNOMEBASEBUILDCLASS = "meson"' must be set before 'inherit gnomebase' * add a patch to fix meson build Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+41
@@ -0,0 +1,41 @@
|
|||||||
|
From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
Date: Mon, 4 Nov 2019 19:19:47 +0100
|
||||||
|
Subject: [PATCH] meson.build: do not ask for python installation / version
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Even by adding python3-setuptools-native the following error is not fixed so
|
||||||
|
just ask for python3 executable.
|
||||||
|
|
||||||
|
| 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
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE specific]
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
meson.build | 7 +------
|
||||||
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 3255328..7a6094c 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -6,12 +6,7 @@ project('mm-common',
|
||||||
|
license: 'GPLv2+'
|
||||||
|
)
|
||||||
|
|
||||||
|
-python3 = import('python').find_installation('python3')
|
||||||
|
-python_version = python3.language_version()
|
||||||
|
-python_version_req = '>= 3.5'
|
||||||
|
-if not python_version.version_compare(python_version_req)
|
||||||
|
- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version))
|
||||||
|
-endif
|
||||||
|
+python3 = import('python3').find_python()
|
||||||
|
|
||||||
|
# Use these instead of meson.source_root() and meson.build_root().
|
||||||
|
# source_root() and build_root() are not useful, if this is a subproject.
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
@@ -2,11 +2,12 @@ SUMMARY = "Common GNOME build files for C++ bindings"
|
|||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
|
GNOMEBASEBUILDCLASS = "meson"
|
||||||
|
|
||||||
inherit gnomebase
|
inherit gnomebase
|
||||||
|
|
||||||
SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718"
|
SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718"
|
||||||
SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4"
|
SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4"
|
||||||
|
SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|||||||
Reference in New Issue
Block a user