diff options
| author | Daniel Skowroński <daniel@dsinf.net> | 2016-12-25 20:59:12 +0100 |
|---|---|---|
| committer | Daniel Skowroński <daniel@dsinf.net> | 2016-12-25 20:59:12 +0100 |
| commit | 546e8a3b44cff7dc3525a672bfe9806d3ee6144e (patch) | |
| tree | d4f47062073b80719d519db8f2863bd739cd078a | |
| parent | 0324e6ca3d19a70dc143d6f73c8bbcc22ac67062 (diff) | |
| download | infinitytier-546e8a3b44cff7dc3525a672bfe9806d3ee6144e.tar.gz infinitytier-546e8a3b44cff7dc3525a672bfe9806d3ee6144e.zip | |
initial netbsd support in makefile/flags
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | make-netbsd.mk | 65 | ||||
| -rw-r--r-- | node/Constants.hpp | 2 |
3 files changed, 70 insertions, 1 deletions
@@ -16,3 +16,7 @@ endif ifeq ($(OSTYPE),OpenBSD) include make-freebsd.mk endif + +ifeq ($(OSTYPE),NetBSD) + include make-netbsd.mk +endif diff --git a/make-netbsd.mk b/make-netbsd.mk new file mode 100644 index 00000000..e2a13d5a --- /dev/null +++ b/make-netbsd.mk @@ -0,0 +1,65 @@ +CC=gcc +CXX=g++ + +INCLUDES= +DEFS= +LIBS= + +include objects.mk +OBJS+=osdep/BSDEthernetTap.o ext/lz4/lz4.o ext/json-parser/json.o ext/http-parser/http_parser.o + +# "make official" is a shortcut for this +ifeq ($(ZT_OFFICIAL_RELEASE),1) + DEFS+=-DZT_OFFICIAL_RELEASE +endif + +# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support +ifeq ($(ZT_ENABLE_CLUSTER),1) + DEFS+=-DZT_ENABLE_CLUSTER +endif + +# "make debug" is a shortcut for this +ifeq ($(ZT_DEBUG),1) + DEFS+=-DZT_TRACE + CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS) + LDFLAGS+= + STRIP=echo + # The following line enables optimization for the crypto code, since + # C25519 in particular is almost UNUSABLE in heavy testing without it. +ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) +else + CFLAGS?=-O3 -fstack-protector + CFLAGS+=-Wall -fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS) + LDFLAGS+=-pie -Wl,-z,relro,-z,now + STRIP=strip --strip-all +endif + +CXXFLAGS+=$(CFLAGS) -fno-rtti + +all: one + +one: $(OBJS) service/OneService.o one.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS) + $(STRIP) zerotier-one + ln -sf zerotier-one zerotier-idtool + ln -sf zerotier-one zerotier-cli + +selftest: $(OBJS) selftest.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) + $(STRIP) zerotier-selftest + +# No installer on FreeBSD yet +#installer: one FORCE +# ./buildinstaller.sh + +clean: + rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* + +debug: FORCE + make -j 4 ZT_DEBUG=1 + +#official: FORCE +# make -j 4 ZT_OFFICIAL_RELEASE=1 +# ./buildinstaller.sh + +FORCE: diff --git a/node/Constants.hpp b/node/Constants.hpp index dc36b3a1..b137e6ae 100644 --- a/node/Constants.hpp +++ b/node/Constants.hpp @@ -70,7 +70,7 @@ #endif #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #ifndef __UNIX_LIKE__ #define __UNIX_LIKE__ #endif |