Drop patch as upstream fixed the issue.
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
meta/recipes-devtools/meson/meson.inc | 4 +-
...01-is_debianlike-always-return-False.patch | 26 ++++++++++++
...y-do-not-substitute-python-s-install.patch | 41 -------------------
.../{meson_0.59.1.bb => meson_0.59.2.bb} | 0
...on_0.59.1.bb => nativesdk-meson_0.59.2.bb} | 0
5 files changed, 28 insertions(+), 43 deletions(-)
create mode 100644
meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
delete mode 100644
meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
rename meta/recipes-devtools/meson/{meson_0.59.1.bb => meson_0.59.2.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.59.1.bb =>
nativesdk-meson_0.59.2.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index c83ea406f0..174ebd9f31 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -11,11 +11,11 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
\
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
-
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://0001-Make-CPU-family-warnings-fatal.patch \
file://0002-Support-building-allarch-recipes-again.patch \
+ file://0001-is_debianlike-always-return-False.patch \
"
-SRC_URI[sha256sum] =
"db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d"
+SRC_URI[sha256sum] =
"13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases";
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git
a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
new file mode 100644
index 0000000000..83c4782a61
--- /dev/null
+++
b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
@@ -0,0 +1,26 @@
+From 667b9ede638677fb37911306937ea62f05897581 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <a...@linutronix.de>
+Date: Mon, 18 Oct 2021 15:55:59 +0200
+Subject: [PATCH] is_debianlike(): always return False
+
+Otherwise, host contamination happens.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <a...@linutronix.de>
+---
+ mesonbuild/mesonlib/universal.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/mesonlib/universal.py
b/mesonbuild/mesonlib/universal.py
+index d670d04..47d1b52 100644
+--- a/mesonbuild/mesonlib/universal.py
++++ b/mesonbuild/mesonlib/universal.py
+@@ -651,7 +651,7 @@ def is_cygwin() -> bool:
+
+
+ def is_debianlike() -> bool:
+- return os.path.isfile('/etc/debian_version')
++ return False
+
+
+ def is_dragonflybsd() -> bool:
diff --git
a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
deleted file mode 100644
index 231414fcb6..0000000000
---
a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kana...@gmail.com>
-Date: Thu, 18 Apr 2019 17:36:11 +0200
-Subject: [PATCH] modules/python.py: do not substitute python's install prefix
- with meson's
-
-Not sure why this is being done, but it
-a) relies on Python's internal variable substitution which may break in the
future
-b) shouldn't be necessary as Python's prefix ought to be correct in the first
place
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
-
----
- mesonbuild/modules/python.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index eda70ce..18edd15 100644
---- a/mesonbuild/modules/python.py
-+++ b/mesonbuild/modules/python.py
-@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
- import json
- import sys
-
--install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '',
'platbase': '', 'installed_base': ''})
-+install_paths = sysconfig.get_paths(scheme='posix_prefix')
-
- def links_against_libpython():
- from distutils.core import Distribution, Extension
-@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder):
- self.variables = info['variables']
- self.paths = info['paths']
- install_paths = info['install_paths']
-- self.platlib_install_path = os.path.join(prefix,
install_paths['platlib'][1:])
-- self.purelib_install_path = os.path.join(prefix,
install_paths['purelib'][1:])
-+ self.platlib_install_path = install_paths['platlib']
-+ self.purelib_install_path = install_paths['purelib']
- self.version = info['version']
- self.platform = info['platform']
- self.is_pypy = info['is_pypy']
diff --git a/meta/recipes-devtools/meson/meson_0.59.1.bb
b/meta/recipes-devtools/meson/meson_0.59.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.59.1.bb
rename to meta/recipes-devtools/meson/meson_0.59.2.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb
b/meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.59.2.bb
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157128):
https://lists.openembedded.org/g/openembedded-core/message/157128
Mute This Topic: https://lists.openembedded.org/mt/86442649/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
