meson: drop redundant is_debianlike() patch

This patch disables is_debianlike() so that it always returns False in the
name of deterministic builds.  However, the caller default_libdir() then
looks at the host filesystem to decide if /usr/lib64 exists and will
return either lib or lib64, so it still isn't deterministic.

This is only used for the default libdir value and meson.bbclass
always passes an explicit --libdir, so this is moot.

(From OE-Core rev: af4200197948f4900761cb1db11680aeab286f92)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-12-12 15:25:41 +00:00
committed by Richard Purdie
parent 352a99611f
commit cb8313a9b2
2 changed files with 0 additions and 28 deletions

View File

@@ -1,27 +0,0 @@
From 361f51c2c7685491186703e8f26be991ab698edc Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@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 <alex@linutronix.de>
---
mesonbuild/utils/universal.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
index 570edd6..4119aa5 100644
--- a/mesonbuild/utils/universal.py
+++ b/mesonbuild/utils/universal.py
@@ -634,7 +634,7 @@ def is_cygwin() -> bool:
def is_debianlike() -> bool:
- return os.path.isfile('/etc/debian_version')
+ return False
def is_dragonflybsd() -> bool:

View File

@@ -15,7 +15,6 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
file://disable-rpath-handling.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 \
file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
"
SRC_URI[sha256sum] = "c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab"