From 6c7084357d1a566ddadc3547b4847cb68a0ac824 Mon Sep 17 00:00:00 2001 From: LingMan <18294-LingMan@users.noreply.gitlab.freedesktop.org> Date: Fri, 1 Aug 2025 18:24:46 +0200 Subject: [PATCH] mesa: Bump required Rust version to 1.82 Firefox ESR requires Rust 1.82 since version 140. Thus, this update is in line with our Rust update policy. Reviewed-by: Faith Ekstrand Reviewed-by: Karol Herbst Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/build-rust.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- docs/rusticl.rst | 2 +- meson.build | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 1e68c94f41e..c06001e0704 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -8,7 +8,7 @@ set -ex section_start rust "Building Rust toolchain" # Pick a specific patch version from rustup so the compiler doesn't drift on us. -RUST_VERSION=1.81.0 +RUST_VERSION=1.82.0 # For rust in Mesa, we use rustup to install. This lets us pick an arbitrary # version of the compiler, rather than whatever the container's Debian comes diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 6bf26bdf8c9..5ccf09e223f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,7 +19,7 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BASE_TAG: "20250723-decorless" + DEBIAN_BASE_TAG: "20250803-rustc" DEBIAN_BUILD_TAG: "20250722-libwayland" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index f60036cd826..ac95543304b 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -48,7 +48,7 @@ To build Rusticl you need to satisfy the following build dependencies: The minimum versions to build Rusticl are: -- Rust: 1.78 +- Rust: 1.82 - Meson: 1.7.0 - Bindgen: 0.71.1 - LLVM: 15.0.0 (recommended 19.0.0) diff --git a/meson.build b/meson.build index 00a6666783e..c454547b07a 100644 --- a/meson.build +++ b/meson.build @@ -769,8 +769,8 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv') or rustc = meson.get_compiler('rust') rust = import('rust') - if rustc.version().version_compare('< 1.78') - error('Mesa requires Rust 1.78.0 or newer') + if rustc.version().version_compare('< 1.82') + error('Mesa requires Rust 1.82.0 or newer') endif # bindgen 0.71 is the first version that knows about `editions`