* [PATCH] rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files
@ 2022-12-01 15:44 Matthias Fischer
0 siblings, 0 replies; only message in thread
From: Matthias Fischer @ 2022-12-01 15:44 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 44310 bytes --]
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 <matthias.fischer(a)ipfire.org>
---
lfs/rust-asn1 | 5 +++++
lfs/rust-asn1_derive | 5 +++++
lfs/rust-autocfg | 5 +++++
lfs/rust-base64 | 5 +++++
lfs/rust-block-buffer | 5 +++++
lfs/rust-chrono | 5 +++++
lfs/rust-cipher | 5 +++++
lfs/rust-crossbeam-channel | 5 +++++
lfs/rust-crossbeam-deque | 5 +++++
lfs/rust-crossbeam-epoch | 5 +++++
lfs/rust-crossbeam-utils | 5 +++++
lfs/rust-crypto-common | 5 +++++
lfs/rust-ctor | 5 +++++
lfs/rust-digest | 5 +++++
lfs/rust-dirs | 5 +++++
lfs/rust-either | 5 +++++
lfs/rust-ghost | 5 +++++
lfs/rust-iana-time-zone | 5 +++++
lfs/rust-indoc | 5 +++++
lfs/rust-indoc-0.3.6 | 5 +++++
lfs/rust-indoc-impl | 5 +++++
lfs/rust-instant | 5 +++++
lfs/rust-inventory | 5 +++++
lfs/rust-inventory-impl | 5 +++++
lfs/rust-itoa | 5 +++++
lfs/rust-lock_api | 5 +++++
lfs/rust-log | 5 +++++
lfs/rust-memoffset | 5 +++++
lfs/rust-num-integer | 5 +++++
lfs/rust-num-traits | 5 +++++
lfs/rust-num_cpus | 5 +++++
lfs/rust-once_cell | 5 +++++
lfs/rust-ouroboros | 5 +++++
lfs/rust-ouroboros_macro | 5 +++++
lfs/rust-parking_lot | 5 +++++
lfs/rust-parking_lot_core | 5 +++++
lfs/rust-paste | 5 +++++
lfs/rust-paste-0.1.18 | 5 +++++
lfs/rust-paste-impl | 5 +++++
lfs/rust-pem | 5 +++++
lfs/rust-pest | 5 +++++
lfs/rust-ppv-lite86 | 5 +++++
lfs/rust-proc-macro-error | 5 +++++
lfs/rust-proc-macro-error-attr | 5 +++++
lfs/rust-proc-macro-hack | 5 +++++
lfs/rust-pyo3 | 5 +++++
lfs/rust-pyo3-build-config | 5 +++++
lfs/rust-pyo3-macros | 5 +++++
lfs/rust-pyo3-macros-backend | 5 +++++
lfs/rust-rand_chacha | 5 +++++
lfs/rust-rand_core | 5 +++++
lfs/rust-rand_core-0.3.1 | 5 +++++
lfs/rust-rand_core-0.4.2 | 5 +++++
lfs/rust-rand_hc | 5 +++++
lfs/rust-rayon | 5 +++++
lfs/rust-rayon-core | 5 +++++
lfs/rust-rdrand | 5 +++++
lfs/rust-regex | 5 +++++
lfs/rust-regex-syntax | 5 +++++
lfs/rust-ryu | 5 +++++
lfs/rust-same-file | 5 +++++
lfs/rust-scopeguard | 5 +++++
lfs/rust-semver | 5 +++++
lfs/rust-serde_json | 5 +++++
lfs/rust-smallvec | 5 +++++
lfs/rust-stable_deref_trait | 5 +++++
lfs/rust-termcolor | 5 +++++
lfs/rust-time | 5 +++++
lfs/rust-toml | 5 +++++
lfs/rust-toolchain_find | 5 +++++
lfs/rust-ucd-trie | 5 +++++
lfs/rust-unindent | 5 +++++
lfs/rust-walkdir | 5 +++++
73 files changed, 365 insertions(+)
diff --git a/lfs/rust-asn1 b/lfs/rust-asn1
index ba2b156a3..d6781aa86 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 59a5c06d1..f43413695 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 1b4fda897..453d005fc 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 1b2d547c4..65838bd36 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 b6d955e15..95ff7bed5 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 35ab126a7..fbebbf8e1 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 d18adb67d..95dfb4b71 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 1361a2481..eb6fa1330 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 139773f30..31f111fb1 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 b1bf8c153..d4de6dff3 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 4fd8ab200..de9e5b2c7 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 739b59a02..659e6cc13 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 ff849a096..ede27e32e 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 f6f38f025..f522543f8 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 7540116f8..33992e010 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 b68acdc57..7c41592c3 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 5437755e2..b56ab62ea 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 8c7be37b0..dc6778ee4 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 9e1f7fb41..ba2ac0055 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 d8eff0bf4..20bb7946c 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 cf901177e..87786e0ca 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 c8b32d0fb..7e0e14872 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 a8cab0de2..177ff9453 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 9e08d3225..9bb8b9304 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 8d1758a0a..162c94474 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 3bd18ea1c..9561a6b6e 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 b3c975f01..02f347047 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 4e3452e40..b2e6780cc 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 2fd539b19..e4e47bb49 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 cf4438214..20c9c9b3d 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 91b62dece..c6c3d57ed 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 304073a31..d6f86df06 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 2c63b4c10..c603807c5 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 84fefc244..834bdfd5c 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 4ccbf63b9..d50323c91 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 c017481d6..dde7645b2 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 ace7b4170..a24924b98 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 138d45ec9..c393b8ebc 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 dbfe85d7c..1672887be 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 dc44ca2b9..c57325e56 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 09ff012b9..d4761702a 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 a1c48338a..e10a8eb21 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 7260b3f93..f50b74a54 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 37c76b170..12fa4e2b7 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 b4970a193..2ec9bb3ec 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 b8da7887d..bea5f698b 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 54de323c0..a274c9803 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 b64490dcd..739389fc5 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 af30b32ab..f5c2c428d 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 91aae604d..f037aef97 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 c6073bf3e..c2eed07f9 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 0491a81d5..673b6cf6e 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 18b0b4bc8..dc2f32826 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 ad6c61656..f09334860 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 b9ca2d5d2..b436be050 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 f87842eb7..0331e101e 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 0ccaea7a6..40acf8b75 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 bba67af81..f7c30058a 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 501e5bf4d..9cb409f7e 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 7faec1aa6..34b09698e 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 aa09b14ea..8cf29a34a 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 b1e1f9478..0b0f66e46 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 5e702e021..04fb355ff 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 95d837e52..9549d0894 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 92b834887..1f509b266 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 9030d3bf2..846e7a88f 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 bb85af933..f68b8521c 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 2ea396c79..372334cb3 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 a6f7a5157..1ba546b8b 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 e1e079cde..bf8baebd5 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 12356cf38..99de1537c 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 5b7e3c192..501bc60d8 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 be8cef684..faa0c7483 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)
--
2.34.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-01 15:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-01 15:44 [PATCH] rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files Matthias Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox