mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-01-22 05:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

rusticl: bump rust req to 1.76

Browse Source 
Current FireFox ESR requires 1.76, so this is an update according to our
rust update policy.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30414>
This commit is contained in:
Karol Herbst 2024-07-29 15:20:01 +02:00 committed by Marge Bot
parent e2de72f71f
commit cc37ecc7ba
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/build-rust.sh
View File

@ -15,7 +15,7 @@ ln -s /usr/local/bin "$HOME"/.cargo/bin
# #
# Also, pick a specific snapshot from rustup so the compiler doesn't drift on # Also, pick a specific snapshot from rustup so the compiler doesn't drift on
# us. # us.
RUST_VERSION=1.73.0-2023-10-05 RUST_VERSION=1.76.0-2024-02-08
# For rust in Mesa, we use rustup to install. This lets us pick an arbitrary # 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 # version of the compiler, rather than whatever the container's Debian comes

2
.gitlab-ci/image-tags.yml
View File

@ -13,7 +13,7 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20240717-pyyaml-3" DEBIAN_BASE_TAG: "20240729-rustc-bump"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20240717-pyyaml-3" DEBIAN_BUILD_TAG: "20240717-pyyaml-3"

2
docs/rusticl.rst
View File

@ -31,7 +31,7 @@ To build Rusticl you need to satisfy the following build dependencies:
The minimum versions to build Rusticl are: The minimum versions to build Rusticl are:
- Rust: 1.66 - Rust: 1.76
- Meson: 1.4.0 - Meson: 1.4.0
- Bindgen: 0.65.0 - Bindgen: 0.65.0
- LLVM: 15.0.0 - LLVM: 15.0.0

4
meson.build
View File

@ -848,6 +848,10 @@ if with_gallium_rusticl
add_languages('rust', required: true) add_languages('rust', required: true)
rustc = meson.get_compiler('rust') rustc = meson.get_compiler('rust')
if rustc.version().version_compare('< 1.76')
error('rusticl requires Rust 1.76.0 or newer')
endif
endif endif
with_clover_spirv = with_gallium_clover and get_option('opencl-spirv') with_clover_spirv = with_gallium_clover and get_option('opencl-spirv')