summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-09-09 10:07:25 +0100
committerSam James <sam@gentoo.org>2022-09-09 10:07:25 +0100
commit55bcc464de70b4b6b695e292592dd47b6175d4ac (patch)
tree80d1dccb60f6811f803b2da64bb014d5f502eb32 /net-misc/zerotier/files
parentapp-misc/jq: fix configure tests (diff)
downloadgentoo-55bcc464de70b4b6b695e292592dd47b6175d4ac.tar.gz
gentoo-55bcc464de70b4b6b695e292592dd47b6175d4ac.tar.bz2
gentoo-55bcc464de70b4b6b695e292592dd47b6175d4ac.zip
net-misc/zerotier: add 1.10.1
Closes: https://bugs.gentoo.org/856013 Closes: https://bugs.gentoo.org/786669 Bug: https://bugs.gentoo.org/718648 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/zerotier/files')
-rw-r--r--net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch14
-rw-r--r--net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch11
2 files changed, 25 insertions, 0 deletions
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch
new file mode 100644
index 000000000000..c0dd5e900269
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch
@@ -0,0 +1,14 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -203,6 +203,11 @@ ifeq ($(CC_MACH),armv7)
+ override DEFS+=-DZT_NO_TYPE_PUNNING
+ ZT_USE_ARM32_NEON_ASM_CRYPTO=1
+ endif
++ifeq ($(CC_MACH),armv7a)
++ ZT_ARCHITECTURE=3
++ override DEFS+=-DZT_NO_TYPE_PUNNING
++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1
++endif
+ ifeq ($(CC_MACH),armv7l)
+ ZT_ARCHITECTURE=3
+ override DEFS+=-DZT_NO_TYPE_PUNNING
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch
new file mode 100644
index 000000000000..41a42197c17d
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -70,7 +70,7 @@ else
+ override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ CXXFLAGS?=-O3 -fstack-protector
+ override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+- LDFLAGS=-pie -Wl,-z,relro,-z,now
++ LDFLAGS?=-pie -Wl,-z,relro,-z,now
+ RUSTFLAGS=--release
+ endif
+