Config: Disable parallel builds for Cargo on riscv64

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

diff --git a/lfs/Config b/lfs/Config
index 8b2e5dabb7494ce6f02bd201b4b57dea8e909f76..53f31ed634854063a32eee168cc6b7fac7829a72 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -34,6 +34,18 @@
 unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
 unexport XZ_OPT
 
+# Basic Variables
+EMPTY :=
+COMMA := ,
+SPACE := $(EMPTY) $(EMPTY)
+define NEWLINE
+
+
+endef
+
+# Basic Functions
+join-with      = $(subst $(SPACE),$(1),$(strip $(2)))
+
 PARALLELISM = $(shell echo $$( \
        if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt 1 ]; then \
                echo 1 ; \
@@ -62,10 +74,6 @@ ifeq "$(BUILD_ARCH)" "x86_64"
        IS_64BIT = 1
 endif
 
-ifeq "$(BUILD_ARCH)" "i586"
-       IS_32BIT = 1
-endif
-
 ifeq "$(BUILD_ARCH)" "riscv64"
        IS_64BIT = 1
 endif
@@ -76,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 \
@@ -144,13 +157,104 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Rust
-export CARGOPATH = $(HOME)/.cargo
+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
+
+CRATE_NAME = $(patsubst rust-%,%,$(firstword $(MAKEFILE_LIST)))
+CRATE_VER  = $(VER)
+CRATE_PATH = $(CARGO_REGISTRY)/$(CRATE_NAME)-$(CRATE_VER)
+
+define CARGO_CONFIG
+[build]
+rustflags = [$(call join-with,$(COMMA)$(SPACE),$(foreach flag,$(RUSTFLAGS),"$(flag)"))]
+
+[env]
+CFLAGS = "$(CFLAGS)"
+CXXFLAGS = "$(CXXFLAGS)"
+LDFLAGS = "$(LDFLAGS)"
+
+[term]
+verbose = true
+
+[source]
+
+[source.local-registry]
+directory = "$(CARGO_REGISTRY)"
+
+[source.crates-io]
+registry = "https://crates.io"
+replace-with = "local-registry"
+endef
+export CARGO_CONFIG
+
+# Set to false if you want to skip the binary install step
+CARGO_HAS_BIN = true
+
+CARGO = \
+       CARGOPATH=$(CARGO_PATH) \
+       RUSTC_BOOTSTRAP=1 \
+       cargo \
+       --offline
+
+CARGO_OPTIONS = \
+       -Z avoid-dev-deps
+
+# Cargo dealocks on riscv64 when building on multiple cores at the same time
+ifeq "$(BUILD_ARCH)" "riscv64"
+       CARGO_OPTIONS += -j1
+else
+       CARGO_OPTIONS += $(MAKETUNING)
+endif
+
+define CARGO_PREPARE
+       mkdir -p $(CARGO_PATH) && \
+       echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \
+       rm -f Cargo.lock
+endef
+
+CARGO_BUILD = \
+       $(CARGO) \
+       build \
+       --release \
+       $(CARGO_OPTIONS)
+
+# Checks whether this crate has a right taregt
+CARGO_TARGET_CHECK = $(CARGO) metadata --format-version 1 --no-deps | \
+       jq -e ".packages[].targets[].kind | any(. == \"$(1)\")" | grep -q "true"
+
+define CARGO_INSTALL
+       mkdir -pv "$(CRATE_PATH)" && \
+       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 && \
+               $(CARGO) package -l | grep -wEv "Cargo.(lock|toml.orig)" \
+                       | xargs -d "\n" cp -v --parents -a -t $(CRATE_PATH) && \
+               install -v -m 644 Cargo.toml.deps $(CRATE_PATH)/Cargo.toml && \
+               echo "{\"files\":{},\"package\":\"\"}" > $(CRATE_PATH)/.cargo-checksum.json; \
+       fi && \
+       if $(CARGO_HAS_BIN) && $(call CARGO_TARGET_CHECK,bin); then \
+               $(CARGO) install $(CARGO_OPTIONS) --no-track --path .; \
+       fi
+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
@@ -187,7 +291,7 @@ define POSTBUILD
        @echo "Updating linker cache..."
        @type -p ldconfig >/dev/null && ldconfig || :
        @echo "Install done; saving file list to $(TARGET) ..."
-       @rm -rf $(GOPATH) $(CARGOPATH)
+       @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
@@ -305,13 +409,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
 
@@ -319,6 +426,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 \