From: Matthias Fischer Date: Thu, 1 Dec 2022 15:44:28 +0000 (+0100) Subject: rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd6846fc9744f6c70a37d69af748443732858dff;p=people%2Fms%2Fipfire-2.x.git rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files Please see the discussions about this patch series here: https://lists.ipfire.org/pipermail/development/2022-November/014714.html and here: https://lists.ipfire.org/pipermail/development/2022-November/014887.html During building 'rust 1.65', I always got: ... error: invalid inclusion of reserved file name Cargo.toml.orig in package source ... [Build stops] After a rather frustrating while, I decided to delete this file during building the particular crate file. Fun! Building completed without errors. For now, I added an appropriate if-statement in each crate file which contains 'Cargo.toml.orig'. If 'Cargo-toml.orig' is present: delete it. Just throw it away. It might be that there is a more elegant way to do this - if 'someone' has a better solution, please submit an easier patch. I searched a few days, but didn't find ANY clue what is going on here. All I can say: building runs. No more errors or breaks. Nothing. Please test and confirm. Signed-off-by: Matthias Fischer --- diff --git a/lfs/rust-asn1 b/lfs/rust-asn1 index ba2b156a33..d6781aa86a 100644 --- a/lfs/rust-asn1 +++ b/lfs/rust-asn1 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-asn1_derive b/lfs/rust-asn1_derive index 59a5c06d1a..f43413695e 100644 --- a/lfs/rust-asn1_derive +++ b/lfs/rust-asn1_derive @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-autocfg b/lfs/rust-autocfg index 1b4fda897d..453d005fcc 100644 --- a/lfs/rust-autocfg +++ b/lfs/rust-autocfg @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-base64 b/lfs/rust-base64 index 1b2d547c4b..65838bd368 100644 --- a/lfs/rust-base64 +++ b/lfs/rust-base64 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-block-buffer b/lfs/rust-block-buffer index b6d955e157..95ff7bed5e 100644 --- a/lfs/rust-block-buffer +++ b/lfs/rust-block-buffer @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-chrono b/lfs/rust-chrono index 35ab126a71..fbebbf8e1c 100644 --- a/lfs/rust-chrono +++ b/lfs/rust-chrono @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-chrono-0.4.22-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-cipher b/lfs/rust-cipher index d18adb67d6..95dfb4b71e 100644 --- a/lfs/rust-cipher +++ b/lfs/rust-cipher @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-crossbeam-channel b/lfs/rust-crossbeam-channel index 1361a24817..eb6fa1330d 100644 --- a/lfs/rust-crossbeam-channel +++ b/lfs/rust-crossbeam-channel @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-crossbeam-deque b/lfs/rust-crossbeam-deque index 139773f308..31f111fb1a 100644 --- a/lfs/rust-crossbeam-deque +++ b/lfs/rust-crossbeam-deque @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-crossbeam-epoch b/lfs/rust-crossbeam-epoch index b1bf8c153f..d4de6dff31 100644 --- a/lfs/rust-crossbeam-epoch +++ b/lfs/rust-crossbeam-epoch @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-crossbeam-utils b/lfs/rust-crossbeam-utils index 4fd8ab200f..de9e5b2c7c 100644 --- a/lfs/rust-crossbeam-utils +++ b/lfs/rust-crossbeam-utils @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-crypto-common b/lfs/rust-crypto-common index 739b59a028..659e6cc134 100644 --- a/lfs/rust-crypto-common +++ b/lfs/rust-crypto-common @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP)&& if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ctor b/lfs/rust-ctor index ff849a0962..ede27e32ec 100644 --- a/lfs/rust-ctor +++ b/lfs/rust-ctor @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-digest b/lfs/rust-digest index f6f38f025d..f522543f8c 100644 --- a/lfs/rust-digest +++ b/lfs/rust-digest @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-dirs b/lfs/rust-dirs index 7540116f85..33992e010a 100644 --- a/lfs/rust-dirs +++ b/lfs/rust-dirs @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-dirs-1.0.5-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-either b/lfs/rust-either index b68acdc571..7c41592c30 100644 --- a/lfs/rust-either +++ b/lfs/rust-either @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ghost b/lfs/rust-ghost index 5437755e22..b56ab62eae 100644 --- a/lfs/rust-ghost +++ b/lfs/rust-ghost @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-iana-time-zone b/lfs/rust-iana-time-zone index 8c7be37b0b..dc6778ee49 100644 --- a/lfs/rust-iana-time-zone +++ b/lfs/rust-iana-time-zone @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-iana-time-zone-0.1.51-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-indoc b/lfs/rust-indoc index 9e1f7fb412..ba2ac0055c 100644 --- a/lfs/rust-indoc +++ b/lfs/rust-indoc @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-indoc-0.3.6 b/lfs/rust-indoc-0.3.6 index d8eff0bf4c..20bb7946cf 100644 --- a/lfs/rust-indoc-0.3.6 +++ b/lfs/rust-indoc-0.3.6 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-indoc-impl b/lfs/rust-indoc-impl index cf901177e8..87786e0ca1 100644 --- a/lfs/rust-indoc-impl +++ b/lfs/rust-indoc-impl @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-instant b/lfs/rust-instant index c8b32d0fb7..7e0e14872e 100644 --- a/lfs/rust-instant +++ b/lfs/rust-instant @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-inventory b/lfs/rust-inventory index a8cab0de2e..177ff94539 100644 --- a/lfs/rust-inventory +++ b/lfs/rust-inventory @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-inventory-impl b/lfs/rust-inventory-impl index 9e08d32254..9bb8b9304c 100644 --- a/lfs/rust-inventory-impl +++ b/lfs/rust-inventory-impl @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-itoa b/lfs/rust-itoa index 8d1758a0a7..162c94474f 100644 --- a/lfs/rust-itoa +++ b/lfs/rust-itoa @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-lock_api b/lfs/rust-lock_api index 3bd18ea1c4..9561a6b6e5 100644 --- a/lfs/rust-lock_api +++ b/lfs/rust-lock_api @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-log b/lfs/rust-log index b3c975f01f..02f347047b 100644 --- a/lfs/rust-log +++ b/lfs/rust-log @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-memoffset b/lfs/rust-memoffset index 4e3452e40d..b2e6780cc0 100644 --- a/lfs/rust-memoffset +++ b/lfs/rust-memoffset @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-num-integer b/lfs/rust-num-integer index 2fd539b193..e4e47bb49b 100644 --- a/lfs/rust-num-integer +++ b/lfs/rust-num-integer @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-num-traits b/lfs/rust-num-traits index cf44382145..20c9c9b3df 100644 --- a/lfs/rust-num-traits +++ b/lfs/rust-num-traits @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-num_cpus b/lfs/rust-num_cpus index 91b62dece8..c6c3d57ed7 100644 --- a/lfs/rust-num_cpus +++ b/lfs/rust-num_cpus @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-num_cpus-1.13.1-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-once_cell b/lfs/rust-once_cell index 304073a310..d6f86df063 100644 --- a/lfs/rust-once_cell +++ b/lfs/rust-once_cell @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ouroboros b/lfs/rust-ouroboros index 2c63b4c107..c603807c54 100644 --- a/lfs/rust-ouroboros +++ b/lfs/rust-ouroboros @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ouroboros_macro b/lfs/rust-ouroboros_macro index 84fefc2446..834bdfd5c3 100644 --- a/lfs/rust-ouroboros_macro +++ b/lfs/rust-ouroboros_macro @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-parking_lot b/lfs/rust-parking_lot index 4ccbf63b96..d50323c913 100644 --- a/lfs/rust-parking_lot +++ b/lfs/rust-parking_lot @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-parking_lot_core b/lfs/rust-parking_lot_core index c017481d65..dde7645b2c 100644 --- a/lfs/rust-parking_lot_core +++ b/lfs/rust-parking_lot_core @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-parking_lot_core-0.8.5-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-paste b/lfs/rust-paste index ace7b4170f..a24924b986 100644 --- a/lfs/rust-paste +++ b/lfs/rust-paste @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-paste-0.1.18 b/lfs/rust-paste-0.1.18 index 138d45ec9b..c393b8ebc9 100644 --- a/lfs/rust-paste-0.1.18 +++ b/lfs/rust-paste-0.1.18 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-paste-impl b/lfs/rust-paste-impl index dbfe85d7c0..1672887be2 100644 --- a/lfs/rust-paste-impl +++ b/lfs/rust-paste-impl @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pem b/lfs/rust-pem index dc44ca2b91..c57325e565 100644 --- a/lfs/rust-pem +++ b/lfs/rust-pem @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pest b/lfs/rust-pest index 09ff012b9b..d4761702a6 100644 --- a/lfs/rust-pest +++ b/lfs/rust-pest @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ppv-lite86 b/lfs/rust-ppv-lite86 index a1c48338ae..e10a8eb216 100644 --- a/lfs/rust-ppv-lite86 +++ b/lfs/rust-ppv-lite86 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-proc-macro-error b/lfs/rust-proc-macro-error index 7260b3f939..f50b74a549 100644 --- a/lfs/rust-proc-macro-error +++ b/lfs/rust-proc-macro-error @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-proc-macro-error-attr b/lfs/rust-proc-macro-error-attr index 37c76b170f..12fa4e2b72 100644 --- a/lfs/rust-proc-macro-error-attr +++ b/lfs/rust-proc-macro-error-attr @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-proc-macro-hack b/lfs/rust-proc-macro-hack index b4970a193a..2ec9bb3ecf 100644 --- a/lfs/rust-proc-macro-hack +++ b/lfs/rust-proc-macro-hack @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pyo3 b/lfs/rust-pyo3 index b8da7887d5..bea5f698b3 100644 --- a/lfs/rust-pyo3 +++ b/lfs/rust-pyo3 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pyo3-build-config b/lfs/rust-pyo3-build-config index 54de323c06..a274c9803e 100644 --- a/lfs/rust-pyo3-build-config +++ b/lfs/rust-pyo3-build-config @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pyo3-macros b/lfs/rust-pyo3-macros index b64490dcdf..739389fc57 100644 --- a/lfs/rust-pyo3-macros +++ b/lfs/rust-pyo3-macros @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-pyo3-macros-backend b/lfs/rust-pyo3-macros-backend index af30b32ab7..f5c2c428d9 100644 --- a/lfs/rust-pyo3-macros-backend +++ b/lfs/rust-pyo3-macros-backend @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rand_chacha b/lfs/rust-rand_chacha index 91aae604d2..f037aef977 100644 --- a/lfs/rust-rand_chacha +++ b/lfs/rust-rand_chacha @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rand_core b/lfs/rust-rand_core index c6073bf3e2..c2eed07f9d 100644 --- a/lfs/rust-rand_core +++ b/lfs/rust-rand_core @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rand_core-0.3.1 b/lfs/rust-rand_core-0.3.1 index 0491a81d55..673b6cf6e1 100644 --- a/lfs/rust-rand_core-0.3.1 +++ b/lfs/rust-rand_core-0.3.1 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rand_core-0.4.2 b/lfs/rust-rand_core-0.4.2 index 18b0b4bc80..dc2f32826c 100644 --- a/lfs/rust-rand_core-0.4.2 +++ b/lfs/rust-rand_core-0.4.2 @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rand_hc b/lfs/rust-rand_hc index ad6c616563..f093348604 100644 --- a/lfs/rust-rand_hc +++ b/lfs/rust-rand_hc @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rayon b/lfs/rust-rayon index b9ca2d5d27..b436be050a 100644 --- a/lfs/rust-rayon +++ b/lfs/rust-rayon @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rayon-core b/lfs/rust-rayon-core index f87842eb72..0331e101e5 100644 --- a/lfs/rust-rayon-core +++ b/lfs/rust-rayon-core @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-rdrand b/lfs/rust-rdrand index 0ccaea7a63..40acf8b753 100644 --- a/lfs/rust-rdrand +++ b/lfs/rust-rdrand @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-regex b/lfs/rust-regex index bba67af819..f7c30058a4 100644 --- a/lfs/rust-regex +++ b/lfs/rust-regex @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-regex-syntax b/lfs/rust-regex-syntax index 501e5bf4da..9cb409f7eb 100644 --- a/lfs/rust-regex-syntax +++ b/lfs/rust-regex-syntax @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ryu b/lfs/rust-ryu index 7faec1aa6e..34b09698e6 100644 --- a/lfs/rust-ryu +++ b/lfs/rust-ryu @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-same-file b/lfs/rust-same-file index aa09b14ea4..8cf29a34af 100644 --- a/lfs/rust-same-file +++ b/lfs/rust-same-file @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-same-file-1.0.6-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-scopeguard b/lfs/rust-scopeguard index b1e1f94786..0b0f66e46e 100644 --- a/lfs/rust-scopeguard +++ b/lfs/rust-scopeguard @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-semver b/lfs/rust-semver index 5e702e0219..04fb355ffa 100644 --- a/lfs/rust-semver +++ b/lfs/rust-semver @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-serde_json b/lfs/rust-serde_json index 95d837e526..9549d08942 100644 --- a/lfs/rust-serde_json +++ b/lfs/rust-serde_json @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-smallvec b/lfs/rust-smallvec index 92b8348878..1f509b266e 100644 --- a/lfs/rust-smallvec +++ b/lfs/rust-smallvec @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-stable_deref_trait b/lfs/rust-stable_deref_trait index 9030d3bf23..846e7a88f6 100644 --- a/lfs/rust-stable_deref_trait +++ b/lfs/rust-stable_deref_trait @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-termcolor b/lfs/rust-termcolor index bb85af933f..f68b8521cb 100644 --- a/lfs/rust-termcolor +++ b/lfs/rust-termcolor @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-termcolor-1.1.2-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-time b/lfs/rust-time index 2ea396c796..372334cb34 100644 --- a/lfs/rust-time +++ b/lfs/rust-time @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-time-0.1.43-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-toml b/lfs/rust-toml index a6f7a51572..1ba546b8bb 100644 --- a/lfs/rust-toml +++ b/lfs/rust-toml @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-toolchain_find b/lfs/rust-toolchain_find index e1e079cdee..bf8baebd55 100644 --- a/lfs/rust-toolchain_find +++ b/lfs/rust-toolchain_find @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-ucd-trie b/lfs/rust-ucd-trie index 12356cf38f..99de1537c0 100644 --- a/lfs/rust-ucd-trie +++ b/lfs/rust-ucd-trie @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-unindent b/lfs/rust-unindent index 5b7e3c1929..501bc60d86 100644 --- a/lfs/rust-unindent +++ b/lfs/rust-unindent @@ -73,6 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL) diff --git a/lfs/rust-walkdir b/lfs/rust-walkdir index be8cef684e..faa0c74834 100644 --- a/lfs/rust-walkdir +++ b/lfs/rust-walkdir @@ -74,6 +74,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rust-walkdir-2.3.2-fix-metadata.patch + + cd $(DIR_APP) && if [ -f Cargo.toml.orig ]; then \ + rm -f Cargo.toml.orig; \ + fi; \ + cd $(DIR_APP) && $(CARGO_PREPARE) cd $(DIR_APP) && $(CARGO_BUILD) cd $(DIR_APP) && $(CARGO_INSTALL)