From e31088aaf96343ce4a0f1d769bc782117f867e68 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 21 Jan 2022 17:27:07 -0500 Subject: [PATCH] Debian build tweaks, and deparallelize Rust for higher order build parallelization. --- debian/rules | 2 +- make-linux.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index d48c96bfc..81fde680b 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong dh $@ --with systemd override_dh_auto_build: - make -j`nproc` + make override_dh_systemd_start: dh_systemd_start --restart-after-upgrade diff --git a/make-linux.mk b/make-linux.mk index fe1f08e38..5b89760ec 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -42,9 +42,9 @@ else endif ifeq ($(ZT_DEBUG),1) - LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl + LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto else - LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl + LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl -lssl -lcrypto endif # Use bundled http-parser since distribution versions are NOT API-stable or compatible! @@ -372,7 +372,7 @@ debug: FORCE make ZT_DEBUG=1 selftest zeroidc: FORCE - cd zeroidc && cargo build $(RUSTFLAGS) + export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS) # Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these # provide backward compatibility with old releases where the binaries actually