Date: Thu, 13 Sep 2018 11:48:34 +0000 (UTC) From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479671 - in head/net/zerotier: . files Message-ID: <201809131148.w8DBmYSx066208@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dch Date: Thu Sep 13 11:48:34 2018 New Revision: 479671 URL: https://svnweb.freebsd.org/changeset/ports/479671 Log: net/zerotier: build on arm and 10.4 x86/x64 & improve compiler settings - use improved C++14 settings contributed by jbeich@ - correct LICENSE_FILES via mat@ and jbeich@ - fixes ARM build from PR#231335 - submitted by Vincent Milum <freebsd@darkain.com> - upstream https://github.com/zerotier/ZeroTierOne/pull/848 Submitted by: Vincent Milum <freebsd@darkain.com> Reported by: jbeich Approved by: jrm (mentor) Obtained from: https://github.com/zerotier/ZeroTierOne/pull/848 Differential Revision: https://reviews.freebsd.org/D16880 Added: head/net/zerotier/files/patch-Makefile (contents, props changed) head/net/zerotier/files/patch-ext_arm32-neon-salsa2012-asm_salsa2012.h (contents, props changed) Modified: head/net/zerotier/Makefile head/net/zerotier/files/patch-make-bsd.mk Modified: head/net/zerotier/Makefile ============================================================================== --- head/net/zerotier/Makefile Thu Sep 13 10:46:24 2018 (r479670) +++ head/net/zerotier/Makefile Thu Sep 13 11:48:34 2018 (r479671) @@ -3,21 +3,20 @@ PORTNAME= zerotier DISTVERSION= 1.2.12 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= dch@FreeBSD.org COMMENT= Network virtualization everywhere -LICENSE= GPLv3 MIT PD BSD3CLAUSE APACHE20 +LICENSE= GPLv3+ MIT PD LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/LICENSE.GPL-3 +LICENSE_FILE_GPLv3+ =${WRKSRC}/LICENSE.GPL-3 +LICENSE_FILE_MIT=${WRKSRC}/ext/json/LICENSE.MIT -BROKEN_armv6= fails to link: Source object ext/arm32-neon-salsa2012-asm/salsa2012.o has EABI version 0, but target zerotier-one has EABI version 5 -BROKEN_armv7= fails to link: Source object ext/arm32-neon-salsa2012-asm/salsa2012.o has EABI version 0, but target zerotier-one has EABI version 5 BROKEN_powerpc64= fails to compile: clang: not found -BROKEN_FreeBSD_10_i386= fails to compile: clang++: error: unable to execute command: Segmentation fault (core dumped) -USES= gmake compiler:c11 +USES= gmake compiler:c++14-lang USE_RC_SUBR= zerotier USE_GITHUB= yes Added: head/net/zerotier/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/zerotier/files/patch-Makefile Thu Sep 13 11:48:34 2018 (r479671) @@ -0,0 +1,11 @@ +--- Makefile.orig 2018-09-13 09:39:16 UTC ++++ Makefile +@@ -11,8 +11,6 @@ ifeq ($(OSTYPE),Linux) + endif + + ifeq ($(OSTYPE),FreeBSD) +- CC=clang +- CXX=clang++ + ZT_BUILD_PLATFORM=7 + include make-bsd.mk + endif Added: head/net/zerotier/files/patch-ext_arm32-neon-salsa2012-asm_salsa2012.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/zerotier/files/patch-ext_arm32-neon-salsa2012-asm_salsa2012.h Thu Sep 13 11:48:34 2018 (r479671) @@ -0,0 +1,14 @@ +--- ext/arm32-neon-salsa2012-asm/salsa2012.h.orig 2018-07-27 21:14:09 UTC ++++ ext/arm32-neon-salsa2012-asm/salsa2012.h +@@ -5,8 +5,10 @@ + #include <sys/auxv.h> + #include <asm/hwcap.h> + #define zt_arm_has_neon() ((getauxval(AT_HWCAP) & HWCAP_NEON) != 0) +-#else ++#elif defined(__ARM_NEON__) || defined(__ARM_NEON) + #define zt_arm_has_neon() (true) ++#else ++#define zt_arm_has_neon() (false) + #endif + + #ifdef __cplusplus Modified: head/net/zerotier/files/patch-make-bsd.mk ============================================================================== --- head/net/zerotier/files/patch-make-bsd.mk Thu Sep 13 10:46:24 2018 (r479670) +++ head/net/zerotier/files/patch-make-bsd.mk Thu Sep 13 11:48:34 2018 (r479671) @@ -1,11 +1,11 @@ ---- make-bsd.mk.orig 2018-05-18 08:50:17 UTC +--- make-bsd.mk.orig 2018-09-13 10:12:22 UTC +++ make-bsd.mk @@ -159,7 +159,7 @@ clean: rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS) debug: FORCE - gmake -j 4 ZT_DEBUG=1 -+ $(MAKE) -j ZT_DEBUG=1 ++ $(MAKE) -j 4 ZT_DEBUG=1 install: one rm -f /usr/local/sbin/zerotier-one
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809131148.w8DBmYSx066208>