diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-07-09 00:51:41 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-07-10 18:26:50 -0700 |
| commit | 6283311fc1032a3dad94bf97e6c5080341a51bc2 (patch) | |
| tree | 63b2756fccb334f67f50acb1449dbda3a087427b /net | |
| parent | 142b73b5dbef01b5a331405da564e33af531b461 (diff) | |
softethervpn: get rid of external iconv
Not really needed.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/softethervpn/Makefile | 3 | ||||
| -rw-r--r-- | net/softethervpn/patches/130-iconv.patch | 33 |
2 files changed, 1 insertions, 35 deletions
diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index d402da53c..0a26abc16 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -29,7 +29,6 @@ HOST_BUILD_DEPENDS:=readline/host libiconv/host PKG_ASLR_PIE:=0 HAMCORE_SE2:=$(STAGING_DIR_HOST)/share/softethervpn/hamcore.se2 -include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -104,7 +103,7 @@ endef define Package/softethervpn-base $(Package/softethervpn/default) - DEPENDS:=+libpthread +librt +libreadline +libopenssl +libncurses +kmod-tun +zlib $(ICONV_DEPENDS) + DEPENDS:=+libpthread +librt +libreadline +libopenssl +libncurses +kmod-tun +zlib TITLE += (Base) endef diff --git a/net/softethervpn/patches/130-iconv.patch b/net/softethervpn/patches/130-iconv.patch deleted file mode 100644 index fd90a97a8..000000000 --- a/net/softethervpn/patches/130-iconv.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/Mayaqua/Mayaqua.h -+++ b/src/Mayaqua/Mayaqua.h -@@ -284,7 +284,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,
---- a/src/makefiles/linux_32bit.mak -+++ b/src/makefiles/linux_32bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm - - OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char - --OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -+OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz - - INSTALL_BINDIR=/usr/bin/ - INSTALL_VPNSERVER_DIR=/usr/vpnserver/ ---- a/src/makefiles/linux_64bit.mak -+++ b/src/makefiles/linux_64bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 - - OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char - --OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -+OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz - - INSTALL_BINDIR=/usr/bin/ - INSTALL_VPNSERVER_DIR=/usr/vpnserver/ |