ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 18:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux build fixes for Rust on some platforms, and OpenSSL on Fedora builds.

Browse Source
This commit is contained in:
Adam Ierymenko 2024-05-02 14:52:57 -04:00
parent 1982071d46
commit 4394ab58d7
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make-linux.mk
View File

@ -62,7 +62,7 @@ ifeq ($(ZT_DEBUG),1)
override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS) override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS)
override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS) override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS)
ZT_TRACE=1 ZT_TRACE=1
RUSTFLAGS= ZT_CARGO_FLAGS=
# The following line enables optimization for the crypto code, since # The following line enables optimization for the crypto code, since
# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box! # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS) node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
@ -72,7 +72,7 @@ else
CXXFLAGS?=-O3 -fstack-protector CXXFLAGS?=-O3 -fstack-protector
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
LDFLAGS=-pie -Wl,-z,relro,-z,now LDFLAGS=-pie -Wl,-z,relro,-z,now
RUSTFLAGS=--release ZT_CARGO_FLAGS=--release
endif endif
ifeq ($(ZT_QNAP), 1) ifeq ($(ZT_QNAP), 1)
@ -438,8 +438,7 @@ debug: FORCE
ifeq ($(ZT_SSO_SUPPORTED), 1) ifeq ($(ZT_SSO_SUPPORTED), 1)
ifeq ($(ZT_EMBEDDED),) ifeq ($(ZT_EMBEDDED),)
zeroidc: FORCE zeroidc: FORCE
# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS) export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(ZT_CARGO_FLAGS) -p zeroidc
export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(RUSTFLAGS) -p zeroidc
endif endif
else else
zeroidc: zeroidc:
@ -447,7 +446,7 @@ endif
ifeq ($(ZT_CONTROLLER), 1) ifeq ($(ZT_CONTROLLER), 1)
smeeclient: FORCE smeeclient: FORCE
export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(RUSTFLAGS) -p smeeclient export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(ZT_CARGO_FLAGS) -p smeeclient
else else
smeeclient: smeeclient:
endif endif

24
zerotier-one.spec
View File

@ -15,20 +15,32 @@ Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif %endif
%if "%{?dist}" == ".fc36" %if "%{?dist}" == ".fc36"
BuildRequires: systemd clang openssl1.1 openssl1.1-devel BuildRequires: systemd clang openssl openssl-devel
Requires: systemd openssl1.1 Requires: systemd openssl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif %endif
%if "%{?dist}" == ".fc37" %if "%{?dist}" == ".fc37"
BuildRequires: systemd clang openssl1.1 openssl1.1-devel BuildRequires: systemd clang openssl openssl-devel
Requires: systemd openssl1.1 Requires: systemd openssl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif %endif
%if "%{?dist}" == ".fc38" %if "%{?dist}" == ".fc38"
BuildRequires: systemd clang openssl1.1 openssl1.1-devel BuildRequires: systemd clang openssl openssl-devel
Requires: systemd openssl1.1 Requires: systemd openssl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif
%if "%{?dist}" == ".fc39"
BuildRequires: systemd clang openssl openssl-devel
Requires: systemd openssl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif
%if "%{?dist}" == ".fc40"
BuildRequires: systemd clang openssl openssl-devel
Requires: systemd openssl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%endif %endif