From 2977cbba22ddccd6b07a3f94fd74db33b4066e29 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 21 Dec 2018 14:29:05 -0200 Subject: [PATCH 1/2] softethervpn: add -Wl,-rpath to HOST_LDFLAGS Avoids failures related to the absence of a matching libreadline.so in the host system. Signed-off-by: Eneas U de Queiroz --- net/softethervpn/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index 1d7bcd4e7..4a480d497 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -39,6 +39,7 @@ HOST_MAKE_FLAGS += -C $(HOST_BUILD_DIR) # Select 32 or 64 bit Makefile for host build depending on host architecture HOST_MAKE_FLAGS += -f src/makefiles/linux_$(if $(shell uname -m | grep 64),64,32)bit.mak +HOST_LDFLAGS += -Wl,-rpath="$(STAGING_DIR_HOSTPKG)/lib" # Prevent calling upstream configure define Host/Configure endef From 80b61c3e57c0d7deef587046ef38315f5adb230e Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 21 Dec 2018 14:59:51 -0200 Subject: [PATCH 2/2] softethervpn: add package name to build dir Current build dir is set at just v$(PKG_VERSION). Signed-off-by: Eneas U de Queiroz --- net/softethervpn/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile index 4a480d497..69ac69e04 100644 --- a/net/softethervpn/Makefile +++ b/net/softethervpn/Makefile @@ -18,8 +18,8 @@ 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/ PKG_HASH:=b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8 -PKG_BUILD_DIR:=$(BUILD_DIR)/v$(PKG_VERSION) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/v$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/v$(PKG_VERSION) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)/v$(PKG_VERSION) PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING