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. Signed-off-by: Ross Burton <[email protected]> --- ...01-is_debianlike-always-return-False.patch | 27 ------------------- meta/recipes-devtools/meson/meson_0.64.0.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch 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 a9a32e2b7a1..00000000000 --- a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 361f51c2c7685491186703e8f26be991ab698edc Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 <[email protected]> - ---- - 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: diff --git a/meta/recipes-devtools/meson/meson_0.64.0.bb b/meta/recipes-devtools/meson/meson_0.64.0.bb index 84c3c84515f..34a04d52ab6 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 \ 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" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174494): https://lists.openembedded.org/g/openembedded-core/message/174494 Mute This Topic: https://lists.openembedded.org/mt/95623428/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
