package/meson: bump version to 1.11.1

https://mesonbuild.com/Release-notes-for-1-11-0.html

Removed patch which is included in this bump.

Disabled the usage of ccache in mesa3d with BR2_PACKAGE_MESA3D_RUSTICL=y
due to upstream commit:
aac5f78580
(bisected https://github.com/mesonbuild/meson/compare/1.10.1...1.10.2 to
 find the offending commit, the same defconfig works with meson 1.10.1)

Without this change mesa3d configure is broken:

output/build/mesa3d-26.0.3/src/gallium/frontends/rusticl/meson.build:420:27:
 ERROR: No build machine compiler for 'src/gallium/frontends/rusticl/proc/lib.rs'

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Tested-by: Fiona Klute <fiona.klute@gmx.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2026-04-26 09:17:10 +02:00
committed by Peter Korsgaard
parent 35f52c7dc5
commit 72a022ec2c
4 changed files with 9 additions and 48 deletions

View File

@@ -71,6 +71,12 @@ MESA3D_CONF_OPTS += \
-Drust_std=2021 \
-Dmesa-clc-bundle-headers=enabled
# meson does not allow ccache
# https://github.com/mesonbuild/meson/commit/aac5f78580a3ea1cf0cae487cb46cab68a048660
MESA3D_CONF_ENV += \
CC_FOR_BUILD="$(HOSTCC_NOCCACHE)" \
CXX_FOR_BUILD="$(HOSTCXX_NOCCACHE)"
MESA3D_MESON_EXTRA_BINARIES += \
rust=['$(HOST_DIR)/bin/rustc','--target=$(RUSTC_TARGET_NAME)'] \
rust_ld='$(TARGET_CROSS)gcc'

View File

@@ -1,45 +0,0 @@
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

View File

@@ -1,4 +1,4 @@
# From https://github.com/mesonbuild/meson/releases/tag/1.10.1
sha256 c42296f12db316a4515b9375a5df330f2e751ccdd4f608430d41d7d6210e4317 meson-1.10.1.tar.gz
# From https://github.com/mesonbuild/meson/releases/tag/1.11.1
sha256 6788ae299979643f8d841bcaf64352558436cae45a0355148a3aeeccf7913866 meson-1.11.1.tar.gz
# Locally computed
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
MESON_VERSION = 1.10.1
MESON_VERSION = 1.11.1
MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
MESON_LICENSE = Apache-2.0
MESON_LICENSE_FILES = COPYING