Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6127 from mwarning/zerotier

Browse source 
zerotier: update to version 1.2.10
This commit is contained in:
Hannu Nyman 2018-05-25 15:19:59 +03:00 committed by GitHub
commit 61c4f98c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/zerotier/Makefile
View file

@ -6,14 +6,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=zerotier PKG_NAME:=zerotier
PKG_VERSION:=1.2.8 PKG_VERSION:=1.2.10
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=08e2df34550d6bb68e106eaac48babb481160046818b0944ec41f1e158548a47 PKG_HASH:=1c79ec57e67764079a77704b336e642ae3cf221dc8088b0cf9e9c81e0a9c0c57
PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)

33
net/zerotier/patches/0003-remove-march-armv5.patch
View file

@ -1,33 +0,0 @@
From bfb1a652dbf897dc065d2a1414296eb145a2224b Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 23 Apr 2018 22:31:03 +0200
Subject: [PATCH 3/4] remove -march=armv5
---
make-linux.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/make-linux.mk b/make-linux.mk
index add1d3ae..49e14f70 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -229,12 +229,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+=-mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CXXFLAGS+=-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
- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm
+ override CFLAGS+=-mno-unaligned-access -marm
+ override CXXFLAGS+=-mno-unaligned-access -marm
endif
endif
--
2.17.0