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

zerotier: fix segfault on ARM platforms

Browse source 
Signed-off-by: Moritz Warning <moritzwarning@web.de>
This commit is contained in:
Moritz Warning 2022-04-13 21:19:38 +02:00 committed by Paul Spooren
parent a5f19e2e83
commit b45d39c142
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/zerotier/Makefile
View file

@ -56,7 +56,7 @@ endif
endef endef
# Make binary smaller # Make binary smaller
TARGET_CFLAGS += -ffunction-sections -fdata-sections -fPIE TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
define Package/zerotier/conffiles define Package/zerotier/conffiles

15
net/zerotier/patches/0001-fix-makefile.patch
View file

@ -29,6 +29,21 @@ Subject: [PATCH 1/3] fix makefile
ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
else else
LDLIBS+=-lnatpmp LDLIBS+=-lnatpmp
@@ -66,11 +66,11 @@ ifeq ($(ZT_DEBUG),1)
# 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)
else
- CFLAGS?=-O3 -fstack-protector -fPIE
+ CFLAGS?=-O3 -fstack-protector
override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
- CXXFLAGS?=-O3 -fstack-protector -fPIE
+ CXXFLAGS?=-O3 -fstack-protector
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
- LDFLAGS=-pie -Wl,-z,relro,-z,now
+ LDFLAGS+=-Wl,-z,relro,-z,now
RUSTFLAGS=--release
endif
@@ -300,7 +300,7 @@ ifeq ($(ZT_CONTROLLER),1) @@ -300,7 +300,7 @@ ifeq ($(ZT_CONTROLLER),1)
endif endif