diff options
author | Sam James <sam@gentoo.org> | 2021-03-16 19:48:55 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-03-16 19:56:20 +0000 |
commit | bbabbfa3d24de9da4c122f776c24de483c72dae5 (patch) | |
tree | c24c47695ec9e019de2d806326de87f5eb574e3c /net-misc/zerotier/files | |
parent | www-client/otter: drop 1.0.01-r1 (diff) | |
download | gentoo-bbabbfa3d24de9da4c122f776c24de483c72dae5.tar.gz gentoo-bbabbfa3d24de9da4c122f776c24de483c72dae5.tar.bz2 gentoo-bbabbfa3d24de9da4c122f776c24de483c72dae5.zip |
net-misc/zerotier: drop 1.4.6, 1.6.2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/zerotier/files')
-rw-r--r-- | net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch deleted file mode 100644 index a6ca7f7ca382..000000000000 --- a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- a/make-linux.mk 2019-09-27 21:35:39.000000000 -0700 -+++ b/make-linux.mk 2019-09-27 21:36:01.000000000 -0700 -@@ -118,6 +118,7 @@ - # Determine system build architecture from compiler target - CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1) - ZT_ARCHITECTURE=999 -+ZT_DISABLE_NEON?= - ifeq ($(CC_MACH),x86_64) - ZT_ARCHITECTURE=2 - ZT_USE_X64_ASM_SALSA=1 -@@ -158,57 +159,57 @@ - ifeq ($(CC_MACH),arm) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),armel) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=1 - endif - ifeq ($(CC_MACH),armhf) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),armv6) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=1 - endif - ifeq ($(CC_MACH),armv6l) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=1 - endif - ifeq ($(CC_MACH),armv6zk) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=1 - endif - ifeq ($(CC_MACH),armv6kz) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=1 - endif - ifeq ($(CC_MACH),armv7) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),armv7a) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),armv7l) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),armv7hl) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_DISABLE_NEON?=0 - endif - ifeq ($(CC_MACH),arm64) - ZT_ARCHITECTURE=4 -@@ -268,10 +269,13 @@ - override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm - override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm - ZT_USE_ARM32_NEON_ASM_CRYPTO=0 -- else -- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions -- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions -+ endif -+ ifeq ($(ZT_DISABLE_NEON),1) -+ override CFLAGS+=-mno-unaligned-access -marm -fexceptions -+ override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions - ZT_USE_ARM32_NEON_ASM_CRYPTO=0 -+ else -+ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 - endif - endif - |