Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 zerotier/ZeroTierOne#848 Submitted by: Vincent Milum <freebsd@darkain.com> Reported by: jbeich Approved by: jrm (mentor) Obtained from: zerotier/ZeroTierOne#848 Differential Revision: https://reviews.freebsd.org/D16880
- Loading branch information
Showing
4 changed files
with
32 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
14 changes: 14 additions & 0 deletions
14
net/zerotier/files/patch-ext_arm32-neon-salsa2012-asm_salsa2012.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |