Files
bpfire/lfs/rust-indoc-0.3.6
Matthias Fischer bd6846fc97 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 <matthias.fischer@ipfire.org>
2023-01-26 23:03:34 +00:00

86 lines
3.3 KiB
Groff

###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.3.6
THISAPP = indoc-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/indoc-0.3.6-$(VER)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_BLAKE2 = ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, b2sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_BLAKE2,$(objects)) :
@$(B2SUM)
###############################################################################
# Installation Details
###############################################################################
$(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)
@rm -rf $(DIR_APP)
@$(POSTBUILD)