From patchwork Tue Feb 1 13:52:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5028 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wr71Vdz3xHT for ; Tue, 1 Feb 2022 13:53:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wl5xxPz2L8; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl2HDdz32KP; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk0Z3Vz2xLF for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wj6DMTzTp; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ektPpxvRs5tkqk8rbKOTsgjspf3BnXUgFZsJ88W5PlI=; b=m7tlXZZU0ZgsWm/gFIL35T9+uGH9WTyQS0HuCtQkOg4DVevhrQ1EiZQCX0Jeb+/X/v/qTf nA3p4WotTKp+qzBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ektPpxvRs5tkqk8rbKOTsgjspf3BnXUgFZsJ88W5PlI=; b=RK9S1IBH5b1zdVZVMagVT3c/1Y4pLmHNcnXmOuot6zcT39YSlqhnbkYVXoy2y8AHfGgsSv r4fb9/07GUp/ohVUCktKLS/gocrNmn3wv8wCHyepsQqDPpsqI+Hf9TIFjrlRjLmBHkWbtA 0lZaQMKWPxisZF837vsdrV0KkMzuP9DUoWkUIymHoza+Ny/Gxg9QV3CHFs2/DGNZohBW75 KO50Yv2i5Ax0ECmJtvfy31DDLbXzlTipllNYITPw4kbQmyyLz/KWh35wpXPyTEh2jxbC6o uUz/Up7ymsL17FTKO/xiWtxujt9TslP5HcDa6+As2kYLqltmB+pLVFQlEE+m/A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/10] make.sh: Add some commands to build Rust packages Date: Tue, 1 Feb 2022 13:52:39 +0000 Message-Id: <20220201135246.4096955-3-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a small set of commands that will be needed to build Rust packages. The idea is to have a couple of macros which do not have to rewritten, but can be customised across the lfs files. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/rust | 1 + config/rootfiles/common/armv6l/rust | 1 + config/rootfiles/common/x86_64/rust | 1 + lfs/Config | 80 +++++++++++++++++++++++++++- lfs/rust | 3 ++ 5 files changed, 84 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust index c26d4591b..f51308f7a 100644 --- a/config/rootfiles/common/aarch64/rust +++ b/config/rootfiles/common/aarch64/rust @@ -64,6 +64,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/config/rootfiles/common/armv6l/rust b/config/rootfiles/common/armv6l/rust index ffe8318ab..7b374d94d 100644 --- a/config/rootfiles/common/armv6l/rust +++ b/config/rootfiles/common/armv6l/rust @@ -59,6 +59,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 6f4c7fd45..5b5080e00 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -62,6 +62,7 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ca628c5eca5e5caf.rlib #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-5c4d6c9d7595f844.rlib #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/lfs/Config b/lfs/Config index 76a07b088..d7a59c5a6 100644 --- 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 ; \ @@ -140,7 +152,71 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif # Rust -export CARGOPATH = $(HOME)/.cargo +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 + +CARGO = \ + CARGOPATH=$(CARGO_PATH) \ + cargo + +define CARGO_PREPARE + mkdir -p $(CARGO_PATH) && \ + echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \ + rm -f Cargo.lock +endef + +CARGO_BUILD = \ + $(CARGO) \ + build \ + $(MAKETUNING) \ + --release + +# Checks whether this crate has a right taregt +CARGO_TARGET_CHECK = cargo metadata --format-version 1 | \ + jq -e ".packages[].targets[].kind | any(. == \"$(1)\")" | grep -q "true" + +define CARGO_INSTALL + mkdir -pv "$(CRATE_PATH)" && \ + if $(call CARGO_TARGET_CHECK,lib); 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 --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 $(call CARGO_TARGET_CHECK,bin); then \ + $(CARGO) install --no-track --path .; \ + fi +endef ############################################################################### # Common Macro Definitions @@ -183,7 +259,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) @$(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 diff --git a/lfs/rust b/lfs/rust index 7ff84379b..2fbc3254e 100644 --- a/lfs/rust +++ b/lfs/rust @@ -90,5 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Remove LLVM tools rm -vf /usr/lib/rustlib/$(RUST_BOOTSTRAP)/bin/rust-ll{d,vm-dwp} + # Create local registry + mkdir -pv $(CARGO_REGISTRY) + @rm -rf $(DIR_APP) @$(POSTBUILD)