From cd2bf6f4b3f2f9221022cff666b548c1dd485e30 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 5 Dec 2014 09:36:16 -0800 Subject: Stash make-freebsd.mk in attic/ to indicate that the FreeBSD port is not done net. Coming soon! --- attic/make-freebsd.mk | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ make-freebsd.mk | 88 --------------------------------------------------- 2 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 attic/make-freebsd.mk delete mode 100644 make-freebsd.mk diff --git a/attic/make-freebsd.mk b/attic/make-freebsd.mk new file mode 100644 index 00000000..74499972 --- /dev/null +++ b/attic/make-freebsd.mk @@ -0,0 +1,88 @@ +CC=cc +CXX=c++ + +INCLUDES= +DEFS= +LIBS= + +include objects.mk +OBJS+= +TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o testnet/TestRoutingTable.o + +# Enable SSE-optimized Salsa20 on x86 and x86_64 machines +MACHINE=$(shell uname -m) +ifeq ($(MACHINE),x86_64) + DEFS+=-DZT_SALSA20_SSE +endif +ifeq ($(MACHINE),amd64) + DEFS+=-DZT_SALSA20_SSE +endif +ifeq ($(MACHINE),i686) + DEFS+=-DZT_SALSA20_SSE +endif +ifeq ($(MACHINE),i586) + DEFS+=-DZT_SALSA20_SSE +endif +ifeq ($(MACHINE),i386) + DEFS+=-DZT_SALSA20_SSE +endif +ifeq ($(MACHINE),x86) + DEFS+=-DZT_SALSA20_SSE +endif + +# "make official" is a shortcut for this +ifeq ($(ZT_OFFICIAL_RELEASE),1) + ZT_AUTO_UPDATE=1 + DEFS+=-DZT_OFFICIAL_RELEASE +endif +ifeq ($(ZT_AUTO_UPDATE),1) + DEFS+=-DZT_AUTO_UPDATE +endif + +# "make debug" is a shortcut for this +ifeq ($(ZT_DEBUG),1) +# DEFS+=-DZT_TRACE -DZT_LOG_STDOUT + 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=-Wall -O3 -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) main.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one main.o $(OBJS) $(LIBS) + $(STRIP) zerotier-one + ln -sf zerotier-one zerotier-cli + ln -sf zerotier-one zerotier-idtool + +selftest: $(OBJS) selftest.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) + $(STRIP) zerotier-selftest + +testnet: $(TESTNET_OBJS) $(OBJS) testnet.o + $(CXX) $(CXXFLAGS) -o zerotier-testnet testnet.o $(OBJS) $(TESTNET_OBJS) $(LIBS) + $(STRIP) zerotier-testnet + +installer: one FORCE + ./buildinstaller.sh + +clean: + rm -rf $(OBJS) $(TESTNET_OBJS) node/*.o osnet/*.o control/*.o testnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* + +debug: FORCE + make -j 4 ZT_DEBUG=1 + +official: FORCE + make -j 4 ZT_OFFICIAL_RELEASE=1 + ./buildinstaller.sh + +FORCE: diff --git a/make-freebsd.mk b/make-freebsd.mk deleted file mode 100644 index 74499972..00000000 --- a/make-freebsd.mk +++ /dev/null @@ -1,88 +0,0 @@ -CC=cc -CXX=c++ - -INCLUDES= -DEFS= -LIBS= - -include objects.mk -OBJS+= -TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o testnet/TestEthernetTapFactory.o testnet/TestRoutingTable.o - -# Enable SSE-optimized Salsa20 on x86 and x86_64 machines -MACHINE=$(shell uname -m) -ifeq ($(MACHINE),x86_64) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),amd64) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i686) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i586) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),i386) - DEFS+=-DZT_SALSA20_SSE -endif -ifeq ($(MACHINE),x86) - DEFS+=-DZT_SALSA20_SSE -endif - -# "make official" is a shortcut for this -ifeq ($(ZT_OFFICIAL_RELEASE),1) - ZT_AUTO_UPDATE=1 - DEFS+=-DZT_OFFICIAL_RELEASE -endif -ifeq ($(ZT_AUTO_UPDATE),1) - DEFS+=-DZT_AUTO_UPDATE -endif - -# "make debug" is a shortcut for this -ifeq ($(ZT_DEBUG),1) -# DEFS+=-DZT_TRACE -DZT_LOG_STDOUT - 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=-Wall -O3 -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) main.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one main.o $(OBJS) $(LIBS) - $(STRIP) zerotier-one - ln -sf zerotier-one zerotier-cli - ln -sf zerotier-one zerotier-idtool - -selftest: $(OBJS) selftest.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) - $(STRIP) zerotier-selftest - -testnet: $(TESTNET_OBJS) $(OBJS) testnet.o - $(CXX) $(CXXFLAGS) -o zerotier-testnet testnet.o $(OBJS) $(TESTNET_OBJS) $(LIBS) - $(STRIP) zerotier-testnet - -installer: one FORCE - ./buildinstaller.sh - -clean: - rm -rf $(OBJS) $(TESTNET_OBJS) node/*.o osnet/*.o control/*.o testnet/*.o *.o zerotier-* build-* ZeroTierOneInstaller-* - -debug: FORCE - make -j 4 ZT_DEBUG=1 - -official: FORCE - make -j 4 ZT_OFFICIAL_RELEASE=1 - ./buildinstaller.sh - -FORCE: -- cgit v1.2.3