dh-cargo-built-using: fix for ring, allow packages to build more than one lib, fixes #26

diff --git a/debian/changelog b/debian/changelog
index 4061057e74d5f7c52929be2a58d681d91ad36569..4f71b976736cb34f7f1ed272dbc60232decd5815 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-cargo (11) UNRELEASED; urgency=medium
+
+  * Reimplement in terms of /usr/share/cargo/bin/cargo wrapper script.
+  * dh-cargo-built-using: fix bug with crates that build >1 static lib.
+
+ -- Ximin Luo <infinity0@debian.org>  Fri, 09 Nov 2018 03:00:00 -0800
+
 dh-cargo (10) unstable; urgency=medium
 
   * Fix usage of "sub install", it takes an extra destdir param.

diff --git a/dh-cargo-built-using b/dh-cargo-built-using
index 649b5e70b3dd145904c24d002becd29a674b7df0..5d7dcb1f50af0fe520cc57206e020ff65bee45d9 100755 (executable)
--- a/dh-cargo-built-using
+++ b/dh-cargo-built-using
@@ -73,10 +73,11 @@ rust_search_lib() {
 
 native_libs() {
        ls -1d "$CARGO_TARGET_DIR/build"/*/output 2>/dev/null | while read output; do
+               sed -nre 's     ^cargo:rustc-link-lib=static=(.*)       \1 '"$output"'  gp' "$output"
+       done | while read lib output; do
                local containing_crate="$(basename "$(dirname "$output")")"
-               local lib=$(sed -nre 's ^cargo:rustc-link-lib=static=(.*)       \1      gp' "$output")
                test -n "$lib" || continue
-               local libfile=$(sed -nre 's     ^cargo:rustc-link-search=native=(.*)    \1      gp' "$output" | rust_search_lib "$lib")
+               local libfile="$(sed -nre 's    ^cargo:rustc-link-search=native=(.*)    \1      gp' "$output" | rust_search_lib "$lib")"
                local srcleft=""
                test -n "$libfile" || { echo >&2 "$0: abort: could not find static lib '$lib'; rustc should have failed already?"; exit 1; }
                if [ "${libfile#$CARGO_TARGET_DIR_ABS/}" != "$libfile" ]; then