From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 28 Jul 2017 19:34:02 +0000 (+0200)
Subject: net/asterisk-11.x and net/asterisk-13.x: fix menuselect
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f616ed7c6ecb4a82947dc3f4f64ecf447d9f9ee9;p=feed%2Ftelephony.git

net/asterisk-11.x and net/asterisk-13.x: fix menuselect

menuselect often fails on the buildbots:

menuselect/menuselect: error while loading shared libraries: libxml2.so.2: cannot open shared object file: No such file or directory

This doesn't happen on all builds. The assumption is that on the
particular buildbot where there is no error the buildbots own libxml2.so
is usable (it exists and the version is suitable).

To fix this make the linker add an rpath to the menuselect utility,
pointing to the hostpkg lib dir.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 2bfadbf..5dc0374 100644
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -310,7 +310,7 @@ define Build/Configure
 		CC="$(HOSTCC)" \
 		CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
 		CONFIG_SITE= \
-		LDFLAGS="$(HOST_LDFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
 		ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
 		./configure \
 		$(HOST_CONFIGURE_ARGS) \
@@ -321,7 +321,7 @@ endef
 define Build/Compile
 	CC="$(HOSTCC)" \
 	CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-	LDFLAGS="$(HOST_LDFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
 	$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
 	$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
 		include/asterisk/buildopts.h defaults.h \
diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index d082d66..13614fd 100644
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -251,7 +251,7 @@ define Build/Configure
 		CC="$(HOSTCC)" \
 		CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
 		CONFIG_SITE= \
-		LDFLAGS="$(HOST_LDFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
 		ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
 		./configure \
 		$(HOST_CONFIGURE_ARGS) \
@@ -262,7 +262,7 @@ endef
 define Build/Compile
 	CC="$(HOSTCC)" \
 	CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-	LDFLAGS="$(HOST_LDFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
 	$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		include/asterisk/version.h \