From b6b94d4aa4c0ca3572a08fdd9d5b6146927f0bbe Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 8 Jun 2020 23:20:22 -0700 Subject: [PATCH] zerotier-one: remove --- srcpkgs/zerotier-one/files/zerotier/run | 2 - srcpkgs/zerotier-one/patches/fix-cross.patch | 59 -------------------- srcpkgs/zerotier-one/template | 22 -------- 3 files changed, 83 deletions(-) delete mode 100644 srcpkgs/zerotier-one/files/zerotier/run delete mode 100644 srcpkgs/zerotier-one/patches/fix-cross.patch delete mode 100644 srcpkgs/zerotier-one/template diff --git a/srcpkgs/zerotier-one/files/zerotier/run b/srcpkgs/zerotier-one/files/zerotier/run deleted file mode 100644 index fce86d3c6ab..00000000000 --- a/srcpkgs/zerotier-one/files/zerotier/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec zerotier-one diff --git a/srcpkgs/zerotier-one/patches/fix-cross.patch b/srcpkgs/zerotier-one/patches/fix-cross.patch deleted file mode 100644 index 6f7bbd90e8f..00000000000 --- a/srcpkgs/zerotier-one/patches/fix-cross.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- make-linux.mk 2019-07-31 22:25:58.000000000 +0200 -+++ make-linux.mk 2019-08-10 07:30:54.288571780 +0200 -@@ -147,6 +147,9 @@ - ifeq ($(CC_MACH),ppc64el) - ZT_ARCHITECTURE=8 - endif -+ifeq ($(CC_MACH),powerpc64) -+ ZT_ARCHITECTURE=8 -+endif - ifeq ($(CC_MACH),i386) - ZT_ARCHITECTURE=1 - endif -@@ -177,22 +177,22 @@ - ifeq ($(CC_MACH),armv6) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif - ifeq ($(CC_MACH),armv6l) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif - ifeq ($(CC_MACH),armv6zk) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif - ifeq ($(CC_MACH),armv6kz) - ZT_ARCHITECTURE=3 - override DEFS+=-DZT_NO_TYPE_PUNNING -- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 -+ ZT_USE_ARM32_NEON_ASM_CRYPTO=0 - endif - ifeq ($(CC_MACH),armv7) - ZT_ARCHITECTURE=3 -@@ -261,19 +261,6 @@ - override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++ - 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 -- ZT_USE_ARM32_NEON_ASM_CRYPTO=0 -- else -- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -- ZT_USE_ARM32_NEON_ASM_CRYPTO=0 -- endif --endif -- - # Build faster crypto on some targets - ifeq ($(ZT_USE_X64_ASM_SALSA),1) - override DEFS+=-DZT_USE_X64_ASM_SALSA2012 diff --git a/srcpkgs/zerotier-one/template b/srcpkgs/zerotier-one/template deleted file mode 100644 index 41e0a842c71..00000000000 --- a/srcpkgs/zerotier-one/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'zerotier' -pkgname=zerotier-one -version=1.4.0.1 -revision=1 -wrksrc=ZeroTierOne-${version} -build_style=gnu-makefile -hostmakedepends="nodejs" -makedepends="sqlite-devel" -short_desc="Network Virtualization Everywhere" -maintainer="Michael Aldridge " -license="GPL-3" -homepage="https://www.zerotier.com/" -distfiles="https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz" -checksum=39f5cdbe589ff550dca9d407f579e87b55a750dbb46458914476fa7dbafb8214 - -pre_install() { - sed -i 's/sbin/bin/g' make-linux.mk -} - -post_install() { - vsv zerotier -}