hassio-addons/addon-zerotier
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-zerotier.git synced 2025-05-04 11:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "⬆️ Upgrades ZeroTier One to 1.6.0"

Browse source 
This reverts commit 92a49b7c41.
This commit is contained in:
Franck Nijhof 2020-11-24 18:13:15 +01:00
parent 92a49b7c41
commit c97814b1ed
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zerotier/Dockerfile
View file

@ -5,6 +5,9 @@ FROM ${BUILD_FROM}
# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# We need to copy in the patches need during build
COPY rootfs/patches /patches
# Setup base
# hadolint ignore=DL3003
RUN \
@ -17,10 +20,11 @@ RUN \
libgcc=9.3.0-r2 \
libstdc++=9.3.0-r2 \
\
&& git clone --branch "1.6.0" --depth=1 \
&& git clone --branch "1.4.6" --depth=1 \
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
\
&& cd /tmp/zerotier \
&& patch -p1 < /patches/ZeroTierOne/gcc9-compat.patch \
&& make \
&& make install \
\

21
zerotier/rootfs/patches/ZeroTierOne/gcc9-compat.patch Normal file
View file

@ -0,0 +1,21 @@
diff --git a/make-linux.mk b/make-linux.mk
index 9fd4f7b9..c409ce0b 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -260,12 +260,12 @@ endif
# ARM32 hell -- use conservative CFLAGS
ifeq ($(ZT_ARCHITECTURE),3)
ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
- 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
+ override CFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CXXFLAGS+=-march=armv6 -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
+ override CFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
+ override CXXFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif