softethervpn: get rid of external iconv

Not really needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile
index d402da53cfa0ff6cb775b77a8ce352ef631f6a75..0a26abc164fa51a6443b93888080765ecd27814e 100644 (file)
--- 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 (file)
index fd90a97..0000000
--- 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>\r
- #endif        // MAYAQUA_SUPPORTS_GETIFADDRS\r
- \r
--#ifdef        UNIX_LINUX\r
-+#if 0\r
- typedef void *iconv_t;\r
- iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);\r
- size_t iconv (iconv_t __cd, char **__restrict __inbuf,\r
---- 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/