mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
softethervpn5: update to 5.01.9671
* update to 5.01.9671
* switch to release tar's
* add cmake iconv and musl patches
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry-pick from 46c320f18f)
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
From a4ed6560017d0b9edcd7cab93ca05d80f794ec10 Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Wed, 10 Jul 2019 17:01:01 -0700
|
||||
Subject: [PATCH] Mayaqua: Replace GNU specific sys/poll.h header with POSIX
|
||||
poll.h
|
||||
|
||||
Fixes warning from the musl libc:
|
||||
|
||||
warning redirecting incorrect #include <sys/poll.h> to <poll.h>
|
||||
---
|
||||
src/Mayaqua/Mayaqua.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
|
||||
index 0f46d52a..63c2edc3 100644
|
||||
--- a/src/Mayaqua/Mayaqua.h
|
||||
+++ b/src/Mayaqua/Mayaqua.h
|
||||
@@ -157,8 +157,8 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
|
||||
#ifdef UNIX_SOLARIS
|
||||
#include <sys/filio.h>
|
||||
#endif // UNIX_SOLARIS
|
||||
-#include <sys/poll.h>
|
||||
#include <sys/resource.h>
|
||||
+#include <poll.h>
|
||||
#include <pthread.h>
|
||||
#ifdef UNIX_LINUX
|
||||
#include <sys/prctl.h>
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/Mayaqua/Mayaqua.h 2019-07-11
|
||||
+++ b/src/Mayaqua/Mayaqua.h 2019-07-11
|
||||
@@ -178,7 +178,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS
|
||||
#include <ifaddrs.h>
|
||||
#endif // MAYAQUA_SUPPORTS_GETIFADDRS
|
||||
|
||||
-#ifdef UNIX_LINUX
|
||||
+#if 0
|
||||
typedef void *iconv_t;
|
||||
iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
|
||||
size_t iconv (iconv_t __cd, char **__restrict __inbuf,
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/Mayaqua/CMakeLists.txt 2019-07-10
|
||||
+++ b/src/Mayaqua/CMakeLists.txt 2019-07-11
|
||||
@@ -59,7 +59,7 @@ if(UNIX)
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
# In some cases libiconv is not included in libc
|
||||
- find_library(LIB_ICONV iconv)
|
||||
+ find_library(LIB_ICONV iconv HINTS "${ICONV_LIB_PATH}")
|
||||
|
||||
find_library(LIB_RT rt)
|
||||
|
||||
Reference in New Issue
Block a user