void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debian build tweaks, and deparallelize Rust for higher order build parallelization.

Browse source
This commit is contained in:
Adam Ierymenko 2022-01-21 17:27:07 -05:00
parent 63b36e8569
commit e31088aaf9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/rules vendored
View file

@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
dh $@ --with systemd dh $@ --with systemd
override_dh_auto_build: override_dh_auto_build:
make -j`nproc` make
override_dh_systemd_start: override_dh_systemd_start:
dh_systemd_start --restart-after-upgrade dh_systemd_start --restart-after-upgrade

6
make-linux.mk
View file

@ -42,9 +42,9 @@ else
endif endif
ifeq ($(ZT_DEBUG),1) ifeq ($(ZT_DEBUG),1)
LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl LDLIBS+=zeroidc/target/debug/libzeroidc.a -ldl -lssl -lcrypto
else else
LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl LDLIBS+=zeroidc/target/release/libzeroidc.a -ldl -lssl -lcrypto
endif endif
# Use bundled http-parser since distribution versions are NOT API-stable or compatible! # Use bundled http-parser since distribution versions are NOT API-stable or compatible!
@ -372,7 +372,7 @@ debug: FORCE
make ZT_DEBUG=1 selftest make ZT_DEBUG=1 selftest
zeroidc: FORCE 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 # Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
# provide backward compatibility with old releases where the binaries actually # provide backward compatibility with old releases where the binaries actually