From 3e3eab12d83fd7b7fccfec981700f187f5d3867e Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sun, 17 Sep 2023 12:44:43 +0200 Subject: [PATCH] rusticl: bump meson req to 1.4 Part-of: --- .gitlab-ci/container/debian/x86_64_build-base.sh | 4 ++-- .gitlab-ci/container/fedora/x86_64_build.sh | 4 ++-- .gitlab-ci/image-tags.yml | 4 ++-- docs/rusticl.rst | 2 +- meson.build | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index f1a5c7d7f1c..3fc891ef573 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -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 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 -# We need at least 1.3.1 for rusticl -pip3 install --break-system-packages 'meson==1.3.1' +# We need at least 1.4.0 for rusticl +pip3 install --break-system-packages 'meson==1.4.0' . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh index ddace0ce124..d0ab414f904 100644 --- a/.gitlab-ci/container/fedora/x86_64_build.sh +++ b/.gitlab-ci/container/fedora/x86_64_build.sh @@ -101,8 +101,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2 cd $XORGMACROS_VERSION; ./configure; make install; cd .. rm -rf $XORGMACROS_VERSION -# We need at least 1.3.1 for rusticl -pip install meson==1.3.1 +# We need at least 1.4.0 for rusticl +pip install meson==1.4.0 . .gitlab-ci/container/build-mold.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c9cfb814836..8600b5eea7b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: 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_BUILD_TAG: "20240509-bindgen" @@ -31,7 +31,7 @@ variables: ALPINE_X86_64_BUILD_TAG: "20240412-pycparser" 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_REPO: "gfx-ci/linux" PKG_REPO_REV: "3cc12a2a" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index 2b78849ae50..5b7f56e24f2 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -32,7 +32,7 @@ To build Rusticl you need to satisfy the following build dependencies: The minimum versions to build Rusticl are: - Rust: 1.66 -- Meson: 1.3.1 +- Meson: 1.4.0 - Bindgen: 0.65.0 - LLVM: 15.0.0 - Clang: 15.0.0 diff --git a/meson.build b/meson.build index 81d8fdf240e..072dd7bcb21 100644 --- a/meson.build +++ b/meson.build @@ -832,8 +832,8 @@ if with_gallium_rusticl error('rusticl requires at least one gallium driver.') endif - if meson.version().version_compare('< 1.3.1') - error('rusticl requires meson 1.3.1 or newer') + if meson.version().version_compare('< 1.4.0') + error('rusticl requires meson 1.4.0 or newer') endif add_languages('rust', required: true)