OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci,rusticl: bump meson req to 1.3.1

Browse Source 
See https://github.com/mesonbuild/meson/pull/12620

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24386>
This commit is contained in:
Karol Herbst
2024-01-05 02:20:53 +01:00
committed by Marge Bot
parent d9fd4d7c0d
commit d72544eea6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/debian/x86_64_build-base.sh
View File

@@ -85,8 +85,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 for stable Rust support # We need at least 1.3.1 for rusticl
pip3 install --break-system-packages 'meson==1.3.0' pip3 install --break-system-packages 'meson==1.3.1'
. .gitlab-ci/container/build-rust.sh . .gitlab-ci/container/build-rust.sh

4
.gitlab-ci/container/fedora/x86_64_build.sh
View File

@@ -96,8 +96,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 for meson's rust.proc_macro # We need at least 1.3.1 for rusticl
pip install meson==1.3.0 pip install meson==1.3.1
. .gitlab-ci/container/build-mold.sh . .gitlab-ci/container/build-mold.sh

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

@@ -7,7 +7,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: "2023-11-18-deqp-runner" DEBIAN_BASE_TAG: "2024-01-05-meson-bump"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-12-27-libdrm" DEBIAN_BUILD_TAG: "2023-12-27-libdrm"
@@ -24,7 +24,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2023-12-11-meson-bump" FEDORA_X86_64_BUILD_TAG: "2024-01-05-meson-bump"
KERNEL_ROOTFS_TAG: "2023-12-22-vkcts" KERNEL_ROOTFS_TAG: "2023-12-22-vkcts"
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"

2
docs/rusticl.rst
View File

@@ -30,7 +30,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.0 - Meson: 1.3.1
- Bindgen: 0.62.0 - Bindgen: 0.62.0
- LLVM: 11.0.0 (recommended: 15.0.0) - LLVM: 11.0.0 (recommended: 15.0.0)
- Clang: 11.0.0 (recommended: 15.0.0) - Clang: 11.0.0 (recommended: 15.0.0)

4
meson.build
View File

@@ -813,8 +813,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') if meson.version().version_compare('< 1.3.1')
error('rusticl requires meson 1.3.0 or newer') error('rusticl requires meson 1.3.1 or newer')
endif endif
add_languages('rust', required: true) add_languages('rust', required: true)