summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch27
-rw-r--r--meta/recipes-devtools/meson/meson_0.64.0.bb1
2 files changed, 0 insertions, 28 deletions
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
deleted file mode 100644
index a9a32e2b7a..0000000000
--- a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 361f51c2c7685491186703e8f26be991ab698edc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 18 Oct 2021 15:55:59 +0200
4Subject: [PATCH] is_debianlike(): always return False
5
6Otherwise, host contamination happens.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10
11---
12 mesonbuild/utils/universal.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
16index 570edd6..4119aa5 100644
17--- a/mesonbuild/utils/universal.py
18+++ b/mesonbuild/utils/universal.py
19@@ -634,7 +634,7 @@ def is_cygwin() -> bool:
20
21
22 def is_debianlike() -> bool:
23- return os.path.isfile('/etc/debian_version')
24+ return False
25
26
27 def is_dragonflybsd() -> bool:
diff --git a/meta/recipes-devtools/meson/meson_0.64.0.bb b/meta/recipes-devtools/meson/meson_0.64.0.bb
index 84c3c84515..34a04d52ab 100644
--- a/meta/recipes-devtools/meson/meson_0.64.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.64.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
15 file://disable-rpath-handling.patch \ 15 file://disable-rpath-handling.patch \
16 file://0001-Make-CPU-family-warnings-fatal.patch \ 16 file://0001-Make-CPU-family-warnings-fatal.patch \
17 file://0002-Support-building-allarch-recipes-again.patch \ 17 file://0002-Support-building-allarch-recipes-again.patch \
18 file://0001-is_debianlike-always-return-False.patch \
19 file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ 18 file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
20 " 19 "
21SRC_URI[sha256sum] = "c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab" 20SRC_URI[sha256sum] = "c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab"