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>
This commit is contained in:
parent
5cb478e3af
commit
f616ed7c6e
2 changed files with 4 additions and 4 deletions
|
@ -310,7 +310,7 @@ define Build/Configure
|
||||||
CC="$(HOSTCC)" \
|
CC="$(HOSTCC)" \
|
||||||
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
||||||
CONFIG_SITE= \
|
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 \
|
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
|
||||||
./configure \
|
./configure \
|
||||||
$(HOST_CONFIGURE_ARGS) \
|
$(HOST_CONFIGURE_ARGS) \
|
||||||
|
@ -321,7 +321,7 @@ endef
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
CC="$(HOSTCC)" \
|
CC="$(HOSTCC)" \
|
||||||
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
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)/menuselect"
|
||||||
$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
|
$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
|
||||||
include/asterisk/buildopts.h defaults.h \
|
include/asterisk/buildopts.h defaults.h \
|
||||||
|
|
|
@ -251,7 +251,7 @@ define Build/Configure
|
||||||
CC="$(HOSTCC)" \
|
CC="$(HOSTCC)" \
|
||||||
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
||||||
CONFIG_SITE= \
|
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 \
|
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
|
||||||
./configure \
|
./configure \
|
||||||
$(HOST_CONFIGURE_ARGS) \
|
$(HOST_CONFIGURE_ARGS) \
|
||||||
|
@ -262,7 +262,7 @@ endef
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
CC="$(HOSTCC)" \
|
CC="$(HOSTCC)" \
|
||||||
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
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)/menuselect"
|
||||||
$(MAKE) -C "$(PKG_BUILD_DIR)" \
|
$(MAKE) -C "$(PKG_BUILD_DIR)" \
|
||||||
include/asterisk/version.h \
|
include/asterisk/version.h \
|
||||||
|
|
Loading…
Reference in a new issue