mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-10 08:14:09 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/meson: fix build error

Browse Source 
Buildroot commit eb1f160b7a bumped meson
to 1.10.0, this release includes upstream commit
35193dd8e4

This commit caused build errors
https://github.com/mesonbuild/meson/issues/15497#issuecomment-3812709660
which were fixed by an upstream commit to the master branch:
c1db93be85

This patch adds to upstream fix to buildroot.

Fixes:
https://autobuild.buildroot.net/results/aab/aaba3d6a9d55c3e8030d3e3487bf93074a4deac1/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-02-04 19:59:01 +01:00
committed by Julien Olivain
parent 16a0560152
commit f18b4289d7
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
package/meson/0003-ninjabackend-do-not-fail-if-only-the-build-machine-u.patch Normal file
View File

@@ -0,0 +1,45 @@
From c1db93be859b360b64fe20d49a286278b56df64e Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 3 Feb 2026 12:56:36 +0100
Subject: [PATCH] ninjabackend: do not fail if only the build machine uses C++
This is caused by the introduction of the cpp_importstd option; while
target_uses_import_std() tries to protect from the option not existing,
this does not work if cpp_importstd exists but build.cpp_importstd does
not, and get_option_for_target() wants to look at the latter.
Just return false on a KeyError for simplicity.
Fixes: #15497
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Upstream: https://github.com/mesonbuild/meson/commit/c1db93be859b360b64fe20d49a286278b56df64e
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
mesonbuild/backend/ninjabackend.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 42f24d47d..e0aaa39c4 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -3297,11 +3297,11 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
def target_uses_import_std(self, target: build.BuildTarget) -> bool:
if 'cpp' not in target.compilers:
return False
- if 'cpp_importstd' not in self.environment.coredata.optstore:
- return False
- if self.environment.coredata.get_option_for_target(target, 'cpp_importstd') == 'false':
+ try:
+ if self.environment.coredata.get_option_for_target(target, 'cpp_importstd') == 'true':
+ return True
+ except KeyError:
return False
- return True
def handle_cpp_import_std(self, target: build.BuildTarget, compiler):
istd_args = []
--
2.47.3