From 86a11248a5db75ee90d62a4b8b38b017c82fd47e Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sun, 17 Sep 2023 12:44:34 +0200 Subject: [PATCH] rusticl: bump bindgen req to 0.65 Part-of: --- .gitlab-ci/container/debian/x86_64_build.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- docs/rusticl.rst | 2 +- src/gallium/frontends/rusticl/meson.build | 8 +------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh index 02fa1ba5c5d..b41223e38bf 100644 --- a/.gitlab-ci/container/debian/x86_64_build.sh +++ b/.gitlab-ci/container/debian/x86_64_build.sh @@ -85,7 +85,7 @@ python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.t # install bindgen RUSTFLAGS='-L native=/usr/local/lib' cargo install \ - bindgen-cli --version 0.62.0 \ + bindgen-cli --version 0.65.1 \ --locked \ -j ${FDO_CI_CONCURRENT:-4} \ --root /usr/local diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 9311e6d225b..c9cfb814836 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20240503-mold" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240503-mold" + DEBIAN_BUILD_TAG: "20240509-bindgen" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index 28cf87dda0e..2b78849ae50 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -33,7 +33,7 @@ The minimum versions to build Rusticl are: - Rust: 1.66 - Meson: 1.3.1 -- Bindgen: 0.62.0 +- Bindgen: 0.65.0 - LLVM: 15.0.0 - Clang: 15.0.0 Updating clang requires a rebuilt of mesa and rusticl if and only if the value of diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index ba58966b450..c3f167641b2 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -128,14 +128,8 @@ if bindgen_version == 'unknown' error('Failed to detect bindgen version. If you are using bindgen 0.69.0, please either update to 0.69.1 or downgrade to 0.68.1. You can install the latest version for your user with `cargo install bindgen-cli`.') endif -if bindgen_version.version_compare('< 0.62') - error('rusticl requires bindgen 0.62 or newer. If your distribution does not ship a recent enough version, you can install the latest version for your user with `cargo install bindgen-cli`.') -endif - if bindgen_version.version_compare('< 0.65') - rusticl_bindgen_args += [ - '--size_t-is-usize', - ] + error('rusticl requires bindgen 0.65 or newer. If your distribution does not ship a recent enough version, you can install the latest version for your user with `cargo install bindgen-cli`.') endif rusticl_bindgen_c_args = [