From 834a08073279fdb653166479cd61863081012ba1 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Thu, 13 Apr 2023 21:14:33 +0200 Subject: [PATCH] rusticl: don't set size_t-is-usize for >=bindgen-0.65 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8827 Fixes: 20c90fed5a0 ("rusticl: added") Signed-off-by: Karol Herbst Part-of: (cherry picked from commit a9cce40dab3218a8bda043387e1df0e27aba211b) --- .pick_status.json | 2 +- src/gallium/frontends/rusticl/meson.build | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7567f6dc681..9df06633f0c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -148,7 +148,7 @@ "description": "rusticl: don't set size_t-is-usize for >=bindgen-0.65", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "20c90fed5a0ab0202ee1ef474c71cb816164a448" }, diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index 82a2fd57376..5c587f783df 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -93,7 +93,6 @@ rusticl_gen_args = [ rusticl_bindgen_args = [ '--no-convert-floats', '--use-array-pointers-in-arguments', - '--size_t-is-usize', '--default-enum-style', 'rust', '--with-derive-partialeq', '--with-derive-eq', @@ -104,6 +103,12 @@ rusticl_bindgen_args = [ '--anon-fields-prefix', 'anon_', ] +if find_program('bindgen').version().version_compare('< 0.65') + rusticl_bindgen_args += [ + '--size_t-is-usize', + ] +endif + rusticl_bindgen_c_args = [ '-fno-builtin-malloc', ]