mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
meson: upgrade to 1.7.1
Drop 0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch as
this is now upstreamed.
Remove the deletion of a .pyc because it uses frozenset(), this bug in
Python has been fixed since 3.11[1]
[1] 51999c960e
(From OE-Core rev: ec524490bfa860a2caf7c3f77924c4dafeb631bf)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4fabfa60a0
commit
a6dbc53b43
|
@ -1,33 +0,0 @@
|
||||||
From 17117c2732c33ebec39e3fec2ecd5a3515dc7d71 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ross Burton <ross.burton@arm.com>
|
|
||||||
Date: Wed, 20 Nov 2024 13:09:38 +0000
|
|
||||||
Subject: [PATCH] dependencies/dev: prepend sysroot when searching for GTest
|
|
||||||
sources
|
|
||||||
|
|
||||||
Don't hardcode paths in /usr when looking for the GTest sources, as in
|
|
||||||
cross-compile or other builds with a sysroot this will find the host
|
|
||||||
sources, not ones that we want to use in the sysroot.
|
|
||||||
|
|
||||||
Closes #12690.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [17117c2732c33ebec39e3fec2ecd5a3515dc7d71]
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
---
|
|
||||||
mesonbuild/dependencies/dev.py | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
|
|
||||||
index 2725a7bb4e88..0c8886b81a04 100644
|
|
||||||
--- a/mesonbuild/dependencies/dev.py
|
|
||||||
+++ b/mesonbuild/dependencies/dev.py
|
|
||||||
@@ -56,7 +56,9 @@ class GTestDependencySystem(SystemDependency):
|
|
||||||
def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]) -> None:
|
|
||||||
super().__init__(name, environment, kwargs, language='cpp')
|
|
||||||
self.main = kwargs.get('main', False)
|
|
||||||
- self.src_dirs = ['/usr/src/gtest/src', '/usr/src/googletest/googletest/src']
|
|
||||||
+
|
|
||||||
+ sysroot = environment.properties[self.for_machine].get_sys_root() or ''
|
|
||||||
+ self.src_dirs = [sysroot + '/usr/src/gtest/src', sysroot + '/usr/src/googletest/googletest/src']
|
|
||||||
if not self._add_sub_dependency(threads_factory(environment, self.for_machine, {})):
|
|
||||||
self.is_found = False
|
|
||||||
return
|
|
|
@ -14,9 +14,8 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
|
||||||
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
|
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
|
||||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||||
file://0002-Support-building-allarch-recipes-again.patch \
|
file://0002-Support-building-allarch-recipes-again.patch \
|
||||||
file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \
|
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "08efbe84803eed07f863b05092d653a9d348f7038761d900412fddf56deb0284"
|
SRC_URI[sha256sum] = "155780a5be87f6dd7f427ad8bcbf0f2b2c5f62ee5fdacca7caa9de8439a24b89"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
|
||||||
|
|
||||||
inherit python_setuptools_build_meta github-releases
|
inherit python_setuptools_build_meta github-releases
|
||||||
|
@ -25,16 +24,6 @@ RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources"
|
||||||
|
|
||||||
FILES:${PN} += "${datadir}/polkit-1"
|
FILES:${PN} += "${datadir}/polkit-1"
|
||||||
|
|
||||||
do_install:append () {
|
|
||||||
# As per the same issue in the python recipe itself:
|
|
||||||
# Unfortunately the following pyc files are non-deterministc due to 'frozenset'
|
|
||||||
# being written without strict ordering, even with PYTHONHASHSEED = 0
|
|
||||||
# Upstream is discussing ways to solve the issue properly, until then let's
|
|
||||||
# just not install the problematic files.
|
|
||||||
# More info: http://benno.id.au/blog/2013/01/15/python-determinism
|
|
||||||
rm -f ${D}${libdir}/python*/site-packages/mesonbuild/dependencies/__pycache__/mpi.cpython*
|
|
||||||
}
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
inherit meson-routines
|
inherit meson-routines
|
Loading…
Reference in New Issue
Block a user