Re: [PATCH 08/13] rust: work around `bindgen` 0.69.0 issue

Finn Behrens
2024-07-04T14:51:21Z

On 1 Jul 2024, at 20:36, Miguel Ojeda wrote:

> `bindgen` 0.69.0 contains a bug: `--version` does not work without
> providing a header [1]:
>
> error: the following required arguments were not provided:
>
>
> Usage: bindgen <FLAGS> <OPTIONS> -- <CLANG_ARGS>...
>
> Thus, in preparation for supporting several `bindgen` versions, work
> around the issue by passing a dummy argument.
>
> Include a comment so that we can remove the workaround in the future.
>
> Link: https://github.com/rust-lang/rust-bindgen/pull/2678 [1]
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Reviewed-by: Finn Behrens <me@kloenk.dev>

> ---
> init/Kconfig | 5 ++++-
> scripts/rust_is_available.sh | 6 +++++-
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/init/Kconfig b/init/Kconfig
> index febdea2afc3b..94e20d3b99d4 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -1928,7 +1928,10 @@ config RUSTC_VERSION_TEXT
> config BINDGEN_VERSION_TEXT
> string
> depends on RUST
> - default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version || echo n)
> + # The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
> + # (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when
> + # the minimum version is upgraded past that (0.69.1 already fixed the issue).
> + default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version workaround-for-0.69.0 || echo n)
>
> #
> # Place an empty function call at each tracepoint site. Can be
> diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh
> index 33bbd01ffe51..cfda8157dce9 100755
> --- a/scripts/rust_is_available.sh
> +++ b/scripts/rust_is_available.sh
> @@ -121,8 +121,12 @@ fi
> # Check that the Rust bindings generator is suitable.
> #
> # Non-stable and distributions' versions may have a version suffix, e.g. `-dev`.
> +#
> +# The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
> +# (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when
> +# the minimum version is upgraded past that (0.69.1 already fixed the issue).
> rust_bindings_generator_output=$( \
> - LC_ALL=C "$BINDGEN" --version 2>/dev/null
> + LC_ALL=C "$BINDGEN" --version workaround-for-0.69.0 2>/dev/null
> ) || rust_bindings_generator_code=$?
> if [ -n "$rust_bindings_generator_code" ]; then
> echo >&2 "***"
> --
> 2.45.2