Module: Mesa Branch: staging/23.0 Commit: 035aa34ed5eb418339c0e2d254cdb5cf8130d548 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=035aa34ed5eb418339c0e2d254cdb5cf8130d548
Author: Karol Herbst <[email protected]> Date: Thu Apr 13 21:14:33 2023 +0200 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22484> (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 3a388561de1..7c16760fd4d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1534,7 +1534,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", "notes": null diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index e53b50a9b8b..68c41813b1a 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -92,7 +92,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', @@ -103,6 +102,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', ]
