mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
d7a76fc351
ncurses is built with wide support enabled, which enables libncursesw. The problem is, the ncurses build system only supplies ncursesw or ncurses.pc but not both. The other problem is, the readline build tests for libncurses before the w variant, making its pc file unusable as there is no ncurses.pc file to satisfy the Required: ncurses section. Just override the library. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15864 Signed-off-by: Robert Marko <robimarko@gmail.com>
21 lines
635 B
Diff
21 lines
635 B
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -7305,6 +7305,9 @@ TERMCAP_DEP=
|
|
elif test $bash_cv_termcap_lib = libncurses; then
|
|
TERMCAP_LIB=-lncurses
|
|
TERMCAP_DEP=
|
|
+elif test $bash_cv_termcap_lib = libncursesw; then
|
|
+TERMCAP_LIB=-lncursesw
|
|
+TERMCAP_DEP=
|
|
elif test $bash_cv_termcap_lib = libc; then
|
|
TERMCAP_LIB=
|
|
TERMCAP_DEP=
|
|
@@ -7340,6 +7343,7 @@ case "$TERMCAP_LIB" in
|
|
-ltinfo) TERMCAP_PKG_CONFIG_LIB=tinfo ;;
|
|
-lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
|
|
-lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
|
|
+-lncursesw) TERMCAP_PKG_CONFIG_LIB=ncursesw ;;
|
|
-ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
|
|
*) TERMCAP_PKG_CONFIG_LIB=termcap ;;
|
|
esac
|