Skip to contentSkip to conversation

meson: fix RDEPENDS

PATCH New Ross Burton 1 participant 3 messages Oct 7, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 meson: fix RDEPENDS

Meson needs python3-pkg-resources to work to add to RDEPENDS.

Remove python3-core as this is automatically pulled in by python3-modules.

---
 meta/recipes-devtools/meson/meson.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/meson/meson.inc +1 -1
index 2958a2a8de4..d365bcd8a35 100644
@@ -32,6 +32,6 @@ UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 
 inherit setuptools3
 
-RDEPENDS_${PN} = "ninja python3-core python3-modules"
+RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources"
 
 FILES_${PN} += "${datadir}/polkit-1"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 meson: update patch status

---
 ...1-environment.py-detect-windows-also-if-the-system-str.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch +1 -1
index 37b5356d77a..2faeda2e711 100644
@@ -4,7 +4,7 @@ Date: Mon, 25 Mar 2019 17:17:06 +0100
 Subject: [PATCH] environment.py: detect windows also if the system string
  contains 'mingw'
 
-Upstream-Status: Pending
+Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/3 meson: fix cross detection

In reply to Ross Burton

Meson 0.51 onwards detects if a build is cross by whether the host and build machines match. However this doesn't work in a number of cross compilation
cases: notably where host is Windows but build is Linux, but also the common OpenEmbedded case where the host and build machine are both x86-64.

Previously we'd patched this to instead look at whether an executable wrapper is
needed: our cross files always set this to true so all cross builds would be identified as cross. However, this breaks build on the target as without a cross file the early cross build detection fails as we don't yet know if an exe wrapper is needed.

The neater solution is to simply go back to the older logic: a cross build has cross files defined.

[ YOCTO #13571 ]

---
 meta/recipes-devtools/meson/meson.inc         |  2 +-
 ...efined-by-the-existance-of-a-cross-f.patch | 28 +++++++++++++++++++
 ...onment.py-do-not-determine-whether-a.patch | 28 -------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
 delete mode 100644 meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
meta/recipes-devtools/meson/meson.inc +1 -1
index d365bcd8a35..8219d87c741 100644
@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://disable-rpath-handling.patch \
            file://cross-prop-default.patch \
            file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
-           file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
+           file://0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch \
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            file://vala-cross-compile.patch \
meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch new file +28 -0
new file mode 100644
index 00000000000..a5dbb81b088
@@ -0,0 +1,28 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <[email protected]>
+
+From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001
+From: Jussi Pakkanen <[email protected]>
+Date: Sun, 6 Oct 2019 15:17:32 +0300
+Subject: [PATCH] Cross build is defined by the existance of a cross file.
+
+---
+ mesonbuild/environment.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index e5d041b4..03c65688 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -611,7 +611,7 @@ class Environment:
+         self.first_invocation = True
+ 
+     def is_cross_build(self) -> bool:
+-        return not self.machines.matches_build_machine(MachineChoice.HOST)
++        return self.coredata.is_cross_build()
+ 
+     def dump_coredata(self):
+         return coredata.save(self.coredata, self.get_build_dir())
+-- 
+2.20.1
+
meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch deleted +0 -28
deleted file mode 100644
index 8cb11879f4d..00000000000
@@ -1,28 +0,0 @@
-From ec9c4a22424a5d55fcf213a55d03f096ec24bcae Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 25 Mar 2019 18:18:33 +0100
-Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build
- is cross by comparing architectures
-
-This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64).
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
-
----
- mesonbuild/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 84a7596..9a029f4 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -520,7 +520,7 @@ class Environment:
-         self.first_invocation = True
- 
-     def is_cross_build(self) -> bool:
--        return not self.machines.matches_build_machine(MachineChoice.HOST)
-+        return self.need_exe_wrapper()
- 
-     def dump_coredata(self):
-         return coredata.save(self.coredata, self.get_build_dir())
Signature · 1 line
2.20.1