From: Ross Burton Date: Mon, 24 Mar 2025 14:29:42 +0000 (+0000) Subject: meson: refresh upstreamed patch X-Git-Tag: 2025-04-walnascar~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=160a088fbe19d0b3c65040b9bc04cc8bdd3d0d24;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git meson: refresh upstreamed patch Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/meson/meson/0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch b/meta/recipes-devtools/meson/meson/0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch index e4700bc91d4..b6579c824ef 100644 --- a/meta/recipes-devtools/meson/meson/0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch +++ b/meta/recipes-devtools/meson/meson/0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch @@ -1,4 +1,4 @@ -From 6f33fb67097beeb17e2345aaec3bda4a57b0b138 Mon Sep 17 00:00:00 2001 +From 17117c2732c33ebec39e3fec2ecd5a3515dc7d71 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Nov 2024 13:09:38 +0000 Subject: [PATCH] dependencies/dev: prepend sysroot when searching for GTest @@ -10,14 +10,14 @@ sources, not ones that we want to use in the sysroot. Closes #12690. -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/13934] +Upstream-Status: Backport [17117c2732c33ebec39e3fec2ecd5a3515dc7d71] Signed-off-by: Ross Burton --- 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 94f51ff69..cceb1756c 100644 +index 2725a7bb4e88..0c8886b81a04 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -56,7 +56,9 @@ class GTestDependencySystem(SystemDependency): @@ -26,11 +26,8 @@ index 94f51ff69..cceb1756c 100644 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 "" ++ 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 --- -2.34.1 -