Browse Source

Merge pull request #11707 from neheb/zerr

zerotier: fix compilation with newer musl
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
720420a84a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
  1. +1
    -1
      net/zerotier/Makefile
  2. +25
    -0
      net/zerotier/patches/020-musl.patch

+ 1
- 1
net/zerotier/Makefile View File

@ -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)?


+ 25
- 0
net/zerotier/patches/020-musl.patch View File

@ -0,0 +1,25 @@
--- a/osdep/OSUtils.hpp
+++ b/osdep/OSUtils.hpp
@@ -37,9 +37,6 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <arpa/inet.h>
-#ifdef __LINUX__
-#include <sys/syscall.h>
-#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
};

Loading…
Cancel
Save