diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-11-04 20:01:13 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-04 21:13:31 -0800 |
commit | 51855dc88686b35501694b4a2c332625d97ad5ef (patch) | |
tree | f082e2a77baad8c92f5f5324259f27b78354aef8 /meta-oe | |
parent | 653d6f11991abec486c34231f09da7e6f2a06483 (diff) | |
download | meta-openembedded-contrib-51855dc88686b35501694b4a2c332625d97ad5ef.tar.gz |
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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb | 5 |
2 files changed, 44 insertions, 2 deletions
diff --git a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch new file mode 100644 index 0000000000..6031eaa782 --- /dev/null +++ b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -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 + diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb index 0b9e58917d..c7d1f2b73c 100644 --- a/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb +++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb @@ -2,11 +2,12 @@ SUMMARY = "Common GNOME build files for C++ bindings" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718" SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4" - -GNOMEBASEBUILDCLASS = "meson" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" BBCLASSEXTEND = "native" |