hexianglong/addon-zerotier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚑 GCC 9.0 compatibility patch, since armv5 has been removed

Browse Source
This commit is contained in:
Franck Nijhof
2020-01-09 14:58:27 +01:00
Unverified
parent 1433ce1d2e
commit 43fe3cec90
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 \
@@ -21,6 +24,7 @@ RUN \
"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