From 92fa4cedf3c35e99a8245487009b29510e933398 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 29 Mar 2020 21:23:42 -0700 Subject: [PATCH] zerotier: fix compilation with newer musl musl 1.2.0 gets rid of this syscall. Just call the function directly. It's easier. Signed-off-by: Rosen Penev --- net/zerotier/Makefile | 2 +- net/zerotier/patches/020-musl.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 net/zerotier/patches/020-musl.patch diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 14a9d6fe8..4baee00d3 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier PKG_VERSION:=1.4.6 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? diff --git a/net/zerotier/patches/020-musl.patch b/net/zerotier/patches/020-musl.patch new file mode 100644 index 000000000..755eb511a --- /dev/null +++ b/net/zerotier/patches/020-musl.patch @@ -0,0 +1,25 @@ +--- a/osdep/OSUtils.hpp ++++ b/osdep/OSUtils.hpp +@@ -37,9 +37,6 @@ + #include + #include + #include +-#ifdef __LINUX__ +-#include +-#endif + #endif + + #ifndef OMIT_JSON_SUPPORT +@@ -211,11 +208,8 @@ public: + return (int64_t)( ((tmp.QuadPart - 116444736000000000LL) / 10000L) + st.wMilliseconds ); + #else + struct timeval tv; +-#ifdef __LINUX__ +- syscall(SYS_gettimeofday,&tv,0); /* fix for musl libc broken gettimeofday bug */ +-#else + gettimeofday(&tv,(struct timezone *)0); +-#endif ++ + return ( (1000LL * (int64_t)tv.tv_sec) + (int64_t)(tv.tv_usec / 1000) ); + #endif + };