aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2016-03-01 21:09:23 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-03-01 21:00:50 +0100
commit6aa9606e7a637709a7ef7c454f19d9cb316f4f67 (patch)
treedf676e7d6bbdc726eb789a05f282015ee75651d3
parent318a4d84892e60e84cd1176f88e202c228feb624 (diff)
downloadbuildroot-6aa9606e7a637709a7ef7c454f19d9cb316f4f67.tar.gz
buildroot-6aa9606e7a637709a7ef7c454f19d9cb316f4f67.tar.bz2
slang: fix static link with readline
slang forgets to link with ncurses that is a dependency of readline when linking the slsh binary. Correct this. While at it, also make sure to use staging ncurses5-config script and not the host one. slang uses ncurses5-config to find terminfo location, and only staging ncurses5-config provides the correct run-time location. Fixes: http://autobuild.buildroot.net/results/1dc/1dc52048254c32a24070fef1c1039cebb32e7ac1/ http://autobuild.buildroot.net/results/c17/c176511cbb147c2d8cb0ec0ff3c1612ce8971cb8/ http://autobuild.buildroot.net/results/78d/78dc2ba07b1d7f888aab94e223f3e0b1a1df3af5/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/slang/slang.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 1a7576afc3..9078bf293c 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -40,6 +40,7 @@ endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
SLANG_DEPENDENCIES += ncurses
+SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
else
SLANG_CONF_OPTS += ac_cv_path_nc5config=no
endif
@@ -47,6 +48,9 @@ endif
ifeq ($(BR2_PACKAGE_READLINE),y)
SLANG_CONF_OPTS += --with-readline=gnu
SLANG_DEPENDENCIES += readline
+ifeq ($(BR2_STATIC_LIBS),y)
+SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
+endif
endif
ifeq ($(BR2_STATIC_LIBS),y)