mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
softethervpn: Really fix iconv support
softethervpn overrides nls.mk by defining its iconv functions. This only works if the libc has iconv. In addition, it does not allow external libiconv usage. TARGET_LDFLAGS is also the wrong place to add -liconv. Removed SSL3 patch. It was needed for OpenSSL 1.0.2 but not anymore. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -12,7 +12,7 @@ PKG_NAME:=softethervpn
|
||||
PKG_VERSION:=4.28-9669
|
||||
PKG_VERREL:=beta
|
||||
PKG_VERDATE:=2018.09.11
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=softether-src-v$(PKG_VERSION)-$(PKG_VERREL).tar.gz
|
||||
PKG_SOURCE_URL:=http://www.softether-download.com/files/softether/v$(PKG_VERSION)-$(PKG_VERREL)-$(PKG_VERDATE)-tree/Source_Code/
|
||||
@@ -25,7 +25,7 @@ PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_BUILD_DEPENDS:=softethervpn/host
|
||||
HOST_BUILD_DEPENDS:=readline/host
|
||||
HOST_BUILD_DEPENDS:=readline/host libiconv/host
|
||||
|
||||
HAMCORE_SE2:=$(STAGING_DIR_HOST)/share/softethervpn/hamcore.se2
|
||||
|
||||
@@ -63,9 +63,6 @@ TARGET_CFLAGS += \
|
||||
$(if $(CONFIG_OPENSSL_WITH_SSL3),,-DSSL_OP_NO_SSLv3) \
|
||||
$(if $(filter mips mipsel,$(ARCH)),-minterlink-mips16)
|
||||
|
||||
TARGET_LDFLAGS += \
|
||||
-liconv
|
||||
|
||||
# Select 32 or 64 bit Makefile for target build depending on 64bit config symbol
|
||||
MAKE_FLAGS += \
|
||||
-f src/makefiles/linux_$(if $(CONFIG_ARCH_64BIT),64,32)bit.mak
|
||||
|
||||
Reference in New Issue
Block a user