Skip to content

Commit 6aa9606

Browse files
baruchsiachjacmet
authored andcommitted
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 <[email protected]> Signed-off-by: Peter Korsgaard <[email protected]>
1 parent 318a4d8 commit 6aa9606

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

package/slang/slang.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,17 @@ endif
4040

4141
ifeq ($(BR2_PACKAGE_NCURSES),y)
4242
SLANG_DEPENDENCIES += ncurses
43+
SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
4344
else
4445
SLANG_CONF_OPTS += ac_cv_path_nc5config=no
4546
endif
4647

4748
ifeq ($(BR2_PACKAGE_READLINE),y)
4849
SLANG_CONF_OPTS += --with-readline=gnu
4950
SLANG_DEPENDENCIES += readline
51+
ifeq ($(BR2_STATIC_LIBS),y)
52+
SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
53+
endif
5054
endif
5155

5256
ifeq ($(BR2_STATIC_LIBS),y)

0 commit comments

Comments
 (0)