rust: Rust's arch for riscv64 is called riscv64gc

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index 3ae5425ee419526757a523b061ebe12a54b308a4..9309b832d89a857781cfbfbb467861a07eac44c7 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -84,6 +84,11 @@ else
        PREFIX = /usr
 endif
 
+# Permit building with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+       export TIME_T_32_BIT_OK = yes
+endif
+
 TAR_OPTIONS = \
        --format=pax \
        --acls \
@@ -152,6 +157,18 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Rust
+ifeq "$(BUILD_ARCH)" "riscv64"
+       RUST_ARCH = riscv64gc
+else
+       RUST_ARCH = $(BUILD_ARCH)
+endif
+
+ifeq "$(BUILD_ARCH)" "armv6l"
+       RUST_PLATFORM = arm-unknown-linux-gnueabi
+else
+       RUST_PLATFORM = $(RUST_ARCH)-unknown-linux-gnu
+endif
+
 CARGO_PATH     = $(DIR_APP)/.cargo
 CARGO_REGISTRY = /usr/share/cargo/registry
 
@@ -213,7 +230,7 @@ CARGO_TARGET_CHECK = $(CARGO) metadata --format-version 1 --no-deps | \
 
 define CARGO_INSTALL
        mkdir -pv "$(CRATE_PATH)" && \
-       if $(call CARGO_TARGET_CHECK,lib); then \
+       if $(call CARGO_TARGET_CHECK,lib) || $(call CARGO_TARGET_CHECK,rlib) || $(call CARGO_TARGET_CHECK,proc-macro); then \
                awk \
                        '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' \
                        < Cargo.toml > Cargo.toml.deps && \
@@ -231,7 +248,7 @@ endef
 # Common Macro Definitions
 ###############################################################################
 
-# For each package we create a list of files that it installed under 
+# For each package we create a list of files that it installed under
 # log/<TARGET> name. Modified files are not identified
 #
 define FIND_FILES
@@ -268,7 +285,7 @@ define POSTBUILD
        @echo "Updating linker cache..."
        @type -p ldconfig >/dev/null && ldconfig || :
        @echo "Install done; saving file list to $(TARGET) ..."
-       @rm -rf $(GOPATH)
+       @rm -rf $(GOPATH) /root/.cargo
        @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
        @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
        @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
@@ -386,13 +403,16 @@ define PAK
        # Cleanup
        rm -rf $(DIR_TMP_PAK)
 
-       # Create meta file
+       # Escape SUMMARY variable and create meta file
+       summaryEscaped=$$(sed 's/[&/\]/\\&/g' <<< "$(SUMMARY)"); \
        sed \
                -e "s/NAME/$(PROG)/g" \
+               -e "s/SUMMARY/$$summaryEscaped/g" \
                -e "s/VER/$(VER)/g" \
                -e "s/RELEASE/$(PAK_VER)/g" \
                -e "s/DEPS/$(DEPS)/g" \
                -e "s/SIZE/$$(stat --format=%s /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
+               -e "s/SERVICES/$(SERVICES)/g" \
          < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
 
@@ -400,6 +420,12 @@ define INSTALL_INITSCRIPT
        install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1)  /etc/rc.d/init.d/$(1)
 endef
 
+define INSTALL_INITSCRIPTS
+       for initscript in $(1); do \
+               $(call INSTALL_INITSCRIPT,$$initscript) || exit 1; \
+    done
+endef
+
 ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)"
 define UPDATE_AUTOMAKE
        for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \