From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/10] make.sh: Add some commands to build Rust packages Date: Tue, 01 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7299980210198432041==" List-Id: --===============7299980210198432041== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/a= arch64/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/ar= mv6l/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/x8= 6_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-ca628c5eca5e5= caf.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_D= IR unexport XZ_OPT =20 +# Basic Variables +EMPTY :=3D +COMMA :=3D , +SPACE :=3D $(EMPTY) $(EMPTY) +define NEWLINE + + +endef + +# Basic Functions +join-with =3D $(subst $(SPACE),$(1),$(strip $(2))) + PARALLELISM =3D $(shell echo $$( \ if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt 1 ]; then \ echo 1 ; \ @@ -140,7 +152,71 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif =20 # Rust -export CARGOPATH =3D $(HOME)/.cargo +CARGO_PATH =3D $(DIR_APP)/.cargo +CARGO_REGISTRY =3D /usr/share/cargo/registry + +CRATE_NAME =3D $(patsubst rust-%,%,$(firstword $(MAKEFILE_LIST))) +CRATE_VER =3D $(VER) +CRATE_PATH =3D $(CARGO_REGISTRY)/$(CRATE_NAME)-$(CRATE_VER) + +define CARGO_CONFIG +[build] +rustflags =3D [$(call join-with,$(COMMA)$(SPACE),$(foreach flag,$(RUSTFLAGS)= ,"$(flag)"))] + +[env] +CFLAGS =3D "$(CFLAGS)" +CXXFLAGS =3D "$(CXXFLAGS)" +LDFLAGS =3D "$(LDFLAGS)" + +[term] +verbose =3D true + +[source] + +[source.local-registry] +directory =3D "$(CARGO_REGISTRY)" + +[source.crates-io] +registry =3D "https://crates.io" +replace-with =3D "local-registry" +endef +export CARGO_CONFIG + +CARGO =3D \ + CARGOPATH=3D$(CARGO_PATH) \ + cargo + +define CARGO_PREPARE + mkdir -p $(CARGO_PATH) && \ + echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \ + rm -f Cargo.lock +endef + +CARGO_BUILD =3D \ + $(CARGO) \ + build \ + $(MAKETUNING) \ + --release + +# Checks whether this crate has a right taregt +CARGO_TARGET_CHECK =3D cargo metadata --format-version 1 | \ + jq -e ".packages[].targets[].kind | any(. =3D=3D \"$(1)\")" | grep -q "true" + +define CARGO_INSTALL + mkdir -pv "$(CRATE_PATH)" && \ + if $(call CARGO_TARGET_CHECK,lib); then \ + awk \ + '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=3D1;next} /^\\\= [/{f=3D0}; !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.jso= n; \ + fi && \ + if $(call CARGO_TARGET_CHECK,bin); then \ + $(CARGO) install --no-track --path .; \ + fi +endef =20 ############################################################################= ### # 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} =20 + # Create local registry + mkdir -pv $(CARGO_REGISTRY) + @rm -rf $(DIR_APP) @$(POSTBUILD) --=20 2.30.2 --===============7299980210198432041==--