webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

rust 1.65 won't build if 'Cargo.toml.orig' is present in one of the crate files

Browse Source 
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@ipfire.org>
This commit is contained in:
Matthias Fischer
2022-12-01 16:44:28 +01:00
committed by Peter Müller
parent 68e2844141
commit bd6846fc97
73 changed files with 365 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/rust-paste-impl
View File

@@ -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)