Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rust: Use make's jobserver when building packages

Browse source 
This allows cargo to use make's jobserver when building packages, by
marking the cargo command as recursive (with the + prefix[1]) and
setting MAKEFLAGS.

This also:

* Give cargo/x.py the build directory instead of having to change the
  current directory (and opening subshells)

* Set PKG_BUILD_PARALLEL/HOST_BUILD_PARALLEL for Rust packages to enable
  the use of make's jobserver

[1]: https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2023-09-23 20:24:37 +08:00
parent 9db7284d58
commit 0dfc1b508d
No known key found for this signature in database
GPG key ID: C616D9E719E868E4
10 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
admin/bottom/Makefile
View file

@ -17,6 +17,7 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_DEPENDS:=rust/host
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/rust/rust-package.mk include ../../lang/rust/rust-package.mk

1
lang/maturin/Makefile
View file

@ -17,6 +17,7 @@ PKG_LICENSE:=Apache-2.0 MIT
PKG_LICENSE_FILES:=license-apache license-mit PKG_LICENSE_FILES:=license-apache license-mit
HOST_BUILD_DEPENDS:=rust/host HOST_BUILD_DEPENDS:=rust/host
HOST_BUILD_PARALLEL:=1
PKG_HOST_ONLY:=1 PKG_HOST_ONLY:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

13
lang/rust/Makefile
View file

@ -80,13 +80,12 @@ define Host/Uninstall
endef endef
define Host/Compile define Host/Compile
( \ CARGO_HOME=$(CARGO_HOME) \
cd $(HOST_BUILD_DIR) ; \ OPENWRT_RUSTC_BOOTSTRAP_CACHE=$(DL_DIR)/rustc \
CARGO_HOME=$(CARGO_HOME) \ $(PYTHON) $(HOST_BUILD_DIR)/x.py \
OPENWRT_RUSTC_BOOTSTRAP_CACHE=$(DL_DIR)/rustc \ --build-dir $(HOST_BUILD_DIR)/build \
$(PYTHON) x.py --config ./config.toml dist build-manifest cargo llvm-tools \ --config $(HOST_BUILD_DIR)/config.toml \
rustc rust-std rust-src ; \ dist build-manifest cargo llvm-tools rustc rust-std rust-src
)
endef endef
define Host/Install define Host/Install

30
lang/rust/rust-host-build.mk
View file

@ -17,29 +17,27 @@ include $(RUST_INCLUDE_DIR)/rust-values.mk
CARGO_HOST_VARS= \ CARGO_HOST_VARS= \
$(CARGO_HOST_CONFIG_VARS) \ $(CARGO_HOST_CONFIG_VARS) \
CC=$(HOSTCC_NOCACHE) CC=$(HOSTCC_NOCACHE) \
MAKEFLAGS="$(HOST_JOBS)"
# $(1) path to the package (optional) # $(1) path to the package (optional)
# $(2) additional arguments to cargo (optional) # $(2) additional arguments to cargo (optional)
define Host/Compile/Cargo define Host/Compile/Cargo
( \ +$(CARGO_HOST_VARS) \
cd $(HOST_BUILD_DIR) ; \ cargo install -v \
$(CARGO_HOST_VARS) \ --profile $(CARGO_HOST_PROFILE) \
cargo install -v \ $(if $(RUST_HOST_FEATURES),--features "$(RUST_HOST_FEATURES)") \
--profile $(CARGO_HOST_PROFILE) \ --root $(HOST_INSTALL_DIR) \
$(if $(RUST_HOST_FEATURES),--features "$(RUST_HOST_FEATURES)") \ --path "$(HOST_BUILD_DIR)/$(if $(strip $(1)),$(strip $(1)))" \
--root $(HOST_INSTALL_DIR) \ $(if $(filter --jobserver%,$(HOST_JOBS)),,-j1) \
--path "$(if $(strip $(1)),$(strip $(1)),.)" $(2) ; \ $(2)
)
endef endef
define Host/Uninstall/Cargo define Host/Uninstall/Cargo
( \ +$(CARGO_HOST_VARS) \
cd $(HOST_BUILD_DIR) ; \ cargo uninstall -v \
$(CARGO_HOST_VARS) \ --root $(HOST_INSTALL_DIR) \
cargo uninstall -v \ || true
--root $(HOST_INSTALL_DIR) || true ; \
)
endef endef
define RustBinHostBuild define RustBinHostBuild

21
lang/rust/rust-package.mk
View file

@ -17,21 +17,20 @@ include $(RUST_INCLUDE_DIR)/rust-values.mk
CARGO_PKG_VARS= \ CARGO_PKG_VARS= \
$(CARGO_PKG_CONFIG_VARS) \ $(CARGO_PKG_CONFIG_VARS) \
CC=$(HOSTCC_NOCACHE) CC=$(HOSTCC_NOCACHE) \
MAKEFLAGS="$(PKG_JOBS)"
# $(1) path to the package (optional) # $(1) path to the package (optional)
# $(2) additional arguments to cargo (optional) # $(2) additional arguments to cargo (optional)
define Build/Compile/Cargo define Build/Compile/Cargo
( \ +$(CARGO_PKG_VARS) \
cd $(PKG_BUILD_DIR) ; \ cargo install -v \
$(CARGO_PKG_VARS) \ --profile $(CARGO_PKG_PROFILE) \
cargo install -v \ $(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") \
--profile $(CARGO_PKG_PROFILE) \ --root $(PKG_INSTALL_DIR) \
$(if $(strip $(RUST_PKG_FEATURES)),--features "$(strip $(RUST_PKG_FEATURES))") \ --path "$(PKG_BUILD_DIR)/$(if $(strip $(1)),$(strip $(1)))" \
--root $(PKG_INSTALL_DIR) \ $(if $(filter --jobserver%,$(PKG_JOBS)),,-j1) \
--path "$(if $(strip $(1)),$(strip $(1)),.)" \ $(2)
$(2) ; \
)
endef endef
define RustBinPackage define RustBinPackage

1
net/aardvark-dns/Makefile
View file

@ -13,6 +13,7 @@ PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_DEPENDS:=rust/host
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/rust/rust-package.mk include ../../lang/rust/rust-package.mk

1
net/netavark/Makefile
View file

@ -15,6 +15,7 @@ PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:= \ PKG_BUILD_DEPENDS:= \
rust/host \ rust/host \
protobuf/host protobuf/host
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/rust/rust-package.mk include ../../lang/rust/rust-package.mk

1
utils/arp-whisper/Makefile
View file

@ -17,6 +17,7 @@ PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENCE PKG_LICENSE_FILES:=LICENCE
PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_DEPENDS:=rust/host
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/rust/rust-package.mk include ../../lang/rust/rust-package.mk

1
utils/procs/Makefile
View file

@ -17,6 +17,7 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENCE PKG_LICENSE_FILES:=LICENCE
PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_DEPENDS:=rust/host
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/rust/rust-package.mk include ../../lang/rust/rust-package.mk

1
utils/ripgrep/Makefile
View file

@ -17,6 +17,7 @@ PKG_LICENSE:=MIT Unlicense
PKG_LICENSE_FILES:=LICENSE-MIT UNLICENSE PKG_LICENSE_FILES:=LICENSE-MIT UNLICENSE
PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_DEPENDS:=rust/host
PKG_BUILD_PARALLEL:=1
RUST_PKG_FEATURES:=pcre2 RUST_PKG_FEATURES:=pcre2