zerotier: fix makefile patch, make static

general/package/zerotier-one/0001-makefile.patch

@@ -26,8 +26,8 @@
  	else
 -		override CFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
 -		override CXXFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
-+		override CFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
-+		override CXXFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
++		override CFLAGS+=-mfloat-abi=soft -marm -mno-unaligned-access
++		override CXXFLAGS+=-mfloat-abi=soft -marm -fexceptions -mno-unaligned-access
  		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
  	endif
  endif

general/package/zerotier-one/zerotier-one.mk

@@ -6,11 +6,10 @@
 
 ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755
 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION))
-# ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp
 ZEROTIER_ONE_LICENSE = BUSL-1.1
 ZEROTIER_ONE_LICENSE_FILES = LICENSE.txt
 
-ZEROTIER_ONE_MAKE_OPTS = \
+ZEROTIER_ONE_MAKE_OPTS = ZT_STATIC=1 ZT_SSO_SUPPORTED=0 \
 	CC="$(TARGET_CC)" \
 	CXX="$(TARGET_CXX)"
 

scripts/executing_commands_for_musl.sh

@@ -19,9 +19,6 @@ ln -sfv /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0
 ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd
 #
 
-if grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} || grep -q ^BR2_PACKAGE_ZEROTIER_ONE=y ${BR2_CONFIG}
-then
-  echo "Keep libsdc++..."
-else
-  rm -f ${TARGET_DIR}/usr/lib/libstdc++*
+if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG}; then
+	rm -f ${TARGET_DIR}/usr/lib/libstdc++*
 fi