From c63c9f20e45a28efd9ab77bc81182e20647360d2 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 11 Apr 2018 08:00:23 -0600 Subject: [PATCH] depends: Add support for unpackaged Rust crates --- depends/cargo-checksum.sh | 2 +- depends/funcs.mk | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/depends/cargo-checksum.sh b/depends/cargo-checksum.sh index 0a104b706..535cc0bfd 100755 --- a/depends/cargo-checksum.sh +++ b/depends/cargo-checksum.sh @@ -10,4 +10,4 @@ sed 's|^|"|' | # 'A":"H(A)' -> '"A":"H(A)' sed 's|$|"|' | # '"A":"H(A)' -> '"A":"H(A)"' tr '\n' ',' | # Concatenate lines with commas sed 's|,$||' # Remove any trailing comma (to fit JSON spec) -)},\"package\":\"$3\"}" > .cargo-checksum.json +)},\"package\":$3}" > .cargo-checksum.json diff --git a/depends/funcs.mk b/depends/funcs.mk index a6f832c06..3d89de8a7 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -31,8 +31,11 @@ define fetch_file endef define generate_crate_checksum -rm .gitignore && \ -$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "$($(1)_sha256_hash)" +$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "\"$($(1)_sha256_hash)\"" +endef + +define generate_unpackaged_crate_checksum +$(BASEDIR)/cargo-checksum.sh "$($(1)_file_name)" "$(build_SHA256SUM)" "null" endef define vendor_crate_source