Module: Mesa Branch: main Commit: 18f1087a21c738ad1270557c5541fe796262066b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18f1087a21c738ad1270557c5541fe796262066b
Author: Karol Herbst <[email protected]> Date: Fri Jun 23 22:11:16 2023 +0200 rusticl: bump bindgen requirement Apparently on some ARM systems any older bindgen version crashes. Signed-off-by: Karol Herbst <[email protected]> Reviewed-by: Nora Allen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23840> --- .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 | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh index 4e7d0bb74a7..77be2bad825 100644 --- a/.gitlab-ci/container/debian/x86_64_build.sh +++ b/.gitlab-ci/container/debian/x86_64_build.sh @@ -92,7 +92,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 --version 0.59.2 \ + bindgen-cli --version 0.62.0 \ -j ${FDO_CI_CONCURRENT:-4} \ --root /usr/local diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a8e4ec583cf..3ec18385d95 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2023-06-21-virglrenderer" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2023-05-25-bookworm" + DEBIAN_BUILD_TAG: "2023-06-23-bindgen-bump" DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index d33d138609a..73b7bd72e72 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -20,7 +20,7 @@ The minimum versions to build Rusticl are: - Rust: 1.60 - Meson: 1.0.0 -- Bindgen: 0.58.0 +- Bindgen: 0.62.0 - LLVM: 11.0.0 (recommended: 15.0.0) - SPIRV-Tools: any version (recommended: v2022.3) diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index 5fa5c3f9648..4bde074d32e 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -94,6 +94,8 @@ rusticl_args = [ rusticl_gen_args = [ # can't do anything about it anyway '-Aclippy::all', + # Some bindgen versions assume `unsafe_op_in_unsafe_fn` + '-Aunused_unsafe', '-Anon_camel_case_types', '-Anon_snake_case', '-Anon_upper_case_globals',
