* [PATCH 0/2] mm-common follow-ups
@ 2019-11-04 19:01 Andreas Müller
2019-11-04 19:01 ` [PATCH 1/2] mm-common: do really build with meson Andreas Müller
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andreas Müller @ 2019-11-04 19:01 UTC (permalink / raw
To: openembedded-devel
To avoid another rebasing dance I sent out 'upgrade 0.9.12 -> 1.0.0 / meson
build / add SUMMARY' in a hurry.
Since hurry has never been a good idea I decided to look into mm-common
again and found:
Andreas Müller (2):
mm-common: do really build with meson
mm-common: build for allarch
...ot-ask-for-python-installation-versi.patch | 41 +++++++++++++++++++
.../recipes-core/mm-common/mm-common_1.0.0.bb | 9 ++--
2 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch
--
2.21.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] mm-common: do really build with meson
2019-11-04 19:01 [PATCH 0/2] mm-common follow-ups Andreas Müller
@ 2019-11-04 19:01 ` Andreas Müller
2019-11-04 19:01 ` [PATCH 2/2] mm-common: build for allarch Andreas Müller
2019-11-04 19:02 ` [PATCH 0/2] mm-common follow-ups Andreas Müller
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Müller @ 2019-11-04 19:01 UTC (permalink / raw
To: openembedded-devel
* 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>
---
...ot-ask-for-python-installation-versi.patch | 41 +++++++++++++++++++
.../recipes-core/mm-common/mm-common_1.0.0.bb | 5 ++-
2 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch
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 000000000..6031eaa78
--- /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 0b9e58917..c7d1f2b73 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"
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] mm-common: build for allarch
2019-11-04 19:01 [PATCH 0/2] mm-common follow-ups Andreas Müller
2019-11-04 19:01 ` [PATCH 1/2] mm-common: do really build with meson Andreas Müller
@ 2019-11-04 19:01 ` Andreas Müller
2019-11-04 19:56 ` Andreas Müller
2019-11-04 19:02 ` [PATCH 0/2] mm-common follow-ups Andreas Müller
2 siblings, 1 reply; 5+ messages in thread
From: Andreas Müller @ 2019-11-04 19:01 UTC (permalink / raw
To: openembedded-devel
mm-common does not compile anything and just installs scripts/marcros/docs. So
make it allarch and save a few build-tasks.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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 c7d1f2b73..4e69ce3c5 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
@@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase
+inherit gnomebase allarch
SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718"
SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4"
SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
-
-BBCLASSEXTEND = "native"
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] mm-common follow-ups
2019-11-04 19:01 [PATCH 0/2] mm-common follow-ups Andreas Müller
2019-11-04 19:01 ` [PATCH 1/2] mm-common: do really build with meson Andreas Müller
2019-11-04 19:01 ` [PATCH 2/2] mm-common: build for allarch Andreas Müller
@ 2019-11-04 19:02 ` Andreas Müller
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Müller @ 2019-11-04 19:02 UTC (permalink / raw
To: openembeded-devel
On Mon, Nov 4, 2019 at 8:01 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> To avoid another rebasing dance I sent out 'upgrade 0.9.12 -> 1.0.0 / meson
> build / add SUMMARY' in a hurry.
> Since hurry has never been a good idea I decided to look into mm-common
> again and found:
>
> Andreas Müller (2):
> mm-common: do really build with meson
> mm-common: build for allarch
Forgot: should apply master-next
>
> ...ot-ask-for-python-installation-versi.patch | 41 +++++++++++++++++++
> .../recipes-core/mm-common/mm-common_1.0.0.bb | 9 ++--
> 2 files changed, 45 insertions(+), 5 deletions(-)
> create mode 100644 meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch
>
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-04 19:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-04 19:01 [PATCH 0/2] mm-common follow-ups Andreas Müller
2019-11-04 19:01 ` [PATCH 1/2] mm-common: do really build with meson Andreas Müller
2019-11-04 19:01 ` [PATCH 2/2] mm-common: build for allarch Andreas Müller
2019-11-04 19:56 ` Andreas Müller
2019-11-04 19:02 ` [PATCH 0/2] mm-common follow-ups Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.