bindgen-cli: Add the build dependency crate:// links

"inherit cargo-update-recipe-crates" was misunderstood, as in
that it doesn't add the build dependencies transparently
during the build. Instead, "bitbake -c update_crates recipe-name"
must be run and the resulting recipe-name-crates.inc file
must be included in the recipe.

Update the recipe with using the crate:// link for bindgen-cli.
Otherwise "bitbake -c update_crates recipe-name" got confused
and produced empty output when using the source in a subdirectory
from the rust-bindgen GIT repo.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>

2 files changed, 70 insertions, 7 deletions

diff --git a/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc b/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc
new file mode 100644
index 0000000..009d415
--- /dev/null
+++ b/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc
@@ -0,0 +1,67 @@
+# Autogenerated with 'bitbake -c update_crates bindgen-cli'
+
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/aho-corasick/0.7.20 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/bindgen/0.64.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/cc/1.0.79 \
+    crate://crates.io/cexpr/0.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clang-sys/1.4.0 \
+    crate://crates.io/clap/4.1.4 \
+    crate://crates.io/clap_derive/4.1.0 \
+    crate://crates.io/clap_lex/0.3.1 \
+    crate://crates.io/either/1.8.1 \
+    crate://crates.io/env_logger/0.9.3 \
+    crate://crates.io/errno/0.2.8 \
+    crate://crates.io/errno-dragonfly/0.1.2 \
+    crate://crates.io/glob/0.3.1 \
+    crate://crates.io/heck/0.4.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/hermit-abi/0.3.0 \
+    crate://crates.io/humantime/2.1.0 \
+    crate://crates.io/io-lifetimes/1.0.5 \
+    crate://crates.io/is-terminal/0.4.3 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/lazycell/1.3.0 \
+    crate://crates.io/libc/0.2.139 \
+    crate://crates.io/libloading/0.7.4 \
+    crate://crates.io/linux-raw-sys/0.1.4 \
+    crate://crates.io/log/0.4.17 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/once_cell/1.17.0 \
+    crate://crates.io/os_str_bytes/6.4.1 \
+    crate://crates.io/peeking_take_while/0.1.2 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.51 \
+    crate://crates.io/quote/1.0.23 \
+    crate://crates.io/regex/1.7.1 \
+    crate://crates.io/regex-syntax/0.6.28 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/rustix/0.36.8 \
+    crate://crates.io/shlex/1.1.0 \
+    crate://crates.io/strsim/0.10.0 \
+    crate://crates.io/syn/1.0.107 \
+    crate://crates.io/termcolor/1.2.0 \
+    crate://crates.io/unicode-ident/1.0.6 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/which/4.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-sys/0.45.0 \
+    crate://crates.io/windows-targets/0.42.1 \
+    crate://crates.io/windows_aarch64_gnullvm/0.42.1 \
+    crate://crates.io/windows_aarch64_msvc/0.42.1 \
+    crate://crates.io/windows_i686_gnu/0.42.1 \
+    crate://crates.io/windows_i686_msvc/0.42.1 \
+    crate://crates.io/windows_x86_64_gnu/0.42.1 \
+    crate://crates.io/windows_x86_64_gnullvm/0.42.1 \
+    crate://crates.io/windows_x86_64_msvc/0.42.1 \
+"
diff --git a/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb b/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb
index 6f66549..80723ef 100644
--- a/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb
+++ b/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb
@@ -2,17 +2,13 @@ SUMMARY = "Automatically generates Rust FFI bindings to C and C++ libraries."
 HOMEPAGE = "https://rust-lang.github.io/rust-bindgen/"
 LICENSE = "BSD-3-Clause"
 
-LIC_FILES_CHKSUM = "file://bindgen-cli/LICENSE;md5=0b9a98cb3dcdefcceb145324693fda9b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0b9a98cb3dcdefcceb145324693fda9b"
 
 inherit rust cargo cargo-update-recipe-crates
 
-SRC_URI = "git://github.com/rust-lang/rust-bindgen.git;protocol=https;nobranch=1;branch=main"
-SRCREV = "ae6817256ac557981906e93a1f866349db85053e"
+SRC_URI = "crate://crates.io/${BPN}/${PV}"
 
-S = "${WORKDIR}/git"
-
-CARGO_SRC_DIR = "bindgen-cli"
-CARGO_LOCK_SRC_DIR = "bindgen-cli"
+require ${BPN}-crates.inc
 
 do_install:append:class-native() {
         create_wrapper ${D}/${bindir}/bindgen LIBCLANG_PATH="${STAGING_LIBDIR_NATIVE}"