From f4e993c814b4c106362bdb8400ef25d09b0ca183 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 3 May 2018 12:51:49 -0700 Subject: Debian clean fix and CentOS 6 upgrade fix. --- make-linux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 08866090..de209d9f 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -286,7 +286,7 @@ manpages: FORCE doc: manpages clean: FORCE - rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o + rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp distclean: clean @@ -355,7 +355,7 @@ debian: FORCE debuild -I -i -us -uc -nc -b debian-clean: FORCE - rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp redhat: FORCE rpmbuild -ba zerotier-one.spec -- cgit v1.2.3 From d01b1ffde51c2becef6ed0b55dfde1659aaa474f Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 12:09:04 -0700 Subject: Added -fPIC for Synology builds --- make-linux.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 2e6a8632..a571f344 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -42,14 +42,6 @@ endif # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. ONE_OBJS+=ext/http-parser/http_parser.o -ifeq ($(ZT_SYNOLOGY), 1) - override DEFS+=-D__SYNOLOGY__ -endif - -ifeq ($(ZT_QNAP), 1) - override DEFS+=-D__QNAP__ -endif - ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif @@ -80,6 +72,15 @@ else STRIP+=--strip-all endif +ifeq ($(ZT_QNAP), 1) + override DEFS+=-D__QNAP__ +endif + +ifeq ($(ZT_SYNOLOGY), 1) + CXXFLAGS+=-fPIC + override DEFS+=-D__SYNOLOGY__ +endif + ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif -- cgit v1.2.3 From c8a907fd71393ac8cdf1664952544c99973e4c79 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 13:03:52 -0700 Subject: Added override directive to CXXFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index a571f344..1280e895 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,7 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) - CXXFLAGS+=-fPIC + override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3 From 22301a459970dc557c4959104afe418d4b2d6bb1 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 14:31:34 -0700 Subject: Added override directive to CFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 1280e895..4a2a3e2d 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,6 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) + override CFLAGS+=-fPIC override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3 From 535ba8a207f7cfc2ce6e8ba2e44442896ffffc29 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 9 May 2018 13:51:32 -0700 Subject: Consolidated powerpc64le machine types, added 32-bit powerpc machine type and a flag to disable use of Linux capabilities --- make-linux.mk | 12 +++++++----- one.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'make-linux.mk') diff --git a/make-linux.mk b/make-linux.mk index 62f319bf..56096da8 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -79,7 +79,7 @@ endif ifeq ($(ZT_SYNOLOGY), 1) override CFLAGS+=-fPIC override CXXFLAGS+=-fPIC - override DEFS+=-D__SYNOLOGY__ + override DEFS+=-D__SYNOLOGY__ endif ifeq ($(ZT_TRACE),1) @@ -111,6 +111,12 @@ ifeq ($(CC_MACH),amd64) endif ifeq ($(CC_MACH),powerpc64le) ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING +endif +ifeq ($(CC_MACH),powerpc) + ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING + override DEFS+=-DZT_NO_CAPABILITIES endif ifeq ($(CC_MACH),ppc64le) ZT_ARCHITECTURE=8 @@ -199,10 +205,6 @@ ifeq ($(CC_MACH),mips64el) ZT_ARCHITECTURE=6 override DEFS+=-DZT_NO_TYPE_PUNNING endif -ifeq ($(CC_MACH),powerpc64le) - ZT_ARCHITECTURE=7 - override DEFS+=-DZT_NO_TYPE_PUNNING -endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) diff --git a/one.cpp b/one.cpp index 9ebc83c1..b770451c 100644 --- a/one.cpp +++ b/one.cpp @@ -972,7 +972,7 @@ static void _sighandlerQuit(int sig) #endif // Drop privileges on Linux, if supported by libc etc. and "zerotier-one" user exists on system -#ifdef __LINUX__ +#if defined(__LINUX__) && !defined(ZT_NO_CAPABILITIES) #ifndef PR_CAP_AMBIENT #define PR_CAP_AMBIENT 47 #define PR_CAP_AMBIENT_IS_SET 1 -- cgit v1.2.3