mirror of https://gitlab.freedesktop.org/mesa/mesa
rusticl: bump meson req to 1.4
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25265>
This commit is contained in:
parent
86a11248a5
commit
3e3eab12d8
|
@ -95,8 +95,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
|
||||||
# Needed for ci-fairy, this revision is able to upload files to S3
|
# Needed for ci-fairy, this revision is able to upload files to S3
|
||||||
pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
|
pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
|
||||||
|
|
||||||
# We need at least 1.3.1 for rusticl
|
# We need at least 1.4.0 for rusticl
|
||||||
pip3 install --break-system-packages 'meson==1.3.1'
|
pip3 install --break-system-packages 'meson==1.4.0'
|
||||||
|
|
||||||
. .gitlab-ci/container/build-rust.sh
|
. .gitlab-ci/container/build-rust.sh
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
|
||||||
cd $XORGMACROS_VERSION; ./configure; make install; cd ..
|
cd $XORGMACROS_VERSION; ./configure; make install; cd ..
|
||||||
rm -rf $XORGMACROS_VERSION
|
rm -rf $XORGMACROS_VERSION
|
||||||
|
|
||||||
# We need at least 1.3.1 for rusticl
|
# We need at least 1.4.0 for rusticl
|
||||||
pip install meson==1.3.1
|
pip install meson==1.4.0
|
||||||
|
|
||||||
. .gitlab-ci/container/build-mold.sh
|
. .gitlab-ci/container/build-mold.sh
|
||||||
|
|
||||||
|
|
|
@ -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: "20240503-mold"
|
DEBIAN_BASE_TAG: "20240509-meson"
|
||||||
|
|
||||||
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
|
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
|
||||||
DEBIAN_BUILD_TAG: "20240509-bindgen"
|
DEBIAN_BUILD_TAG: "20240509-bindgen"
|
||||||
|
@ -31,7 +31,7 @@ variables:
|
||||||
|
|
||||||
ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
|
ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
|
||||||
ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
|
ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
|
||||||
FEDORA_X86_64_BUILD_TAG: "20240503-mold"
|
FEDORA_X86_64_BUILD_TAG: "20240509-meson"
|
||||||
KERNEL_TAG: "v6.6.21-mesa-f8ea"
|
KERNEL_TAG: "v6.6.21-mesa-f8ea"
|
||||||
KERNEL_REPO: "gfx-ci/linux"
|
KERNEL_REPO: "gfx-ci/linux"
|
||||||
PKG_REPO_REV: "3cc12a2a"
|
PKG_REPO_REV: "3cc12a2a"
|
||||||
|
|
|
@ -32,7 +32,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.66
|
||||||
- Meson: 1.3.1
|
- Meson: 1.4.0
|
||||||
- Bindgen: 0.65.0
|
- Bindgen: 0.65.0
|
||||||
- LLVM: 15.0.0
|
- LLVM: 15.0.0
|
||||||
- Clang: 15.0.0
|
- Clang: 15.0.0
|
||||||
|
|
|
@ -832,8 +832,8 @@ if with_gallium_rusticl
|
||||||
error('rusticl requires at least one gallium driver.')
|
error('rusticl requires at least one gallium driver.')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if meson.version().version_compare('< 1.3.1')
|
if meson.version().version_compare('< 1.4.0')
|
||||||
error('rusticl requires meson 1.3.1 or newer')
|
error('rusticl requires meson 1.4.0 or newer')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
add_languages('rust', required: true)
|
add_languages('rust', required: true)
|
||||||
|
|
Loading…
Reference in New Issue