forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Link: openwrt#15864 Signed-off-by: Robert Marko <[email protected]>
- Loading branch information
Showing
2 changed files
with
22 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- 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 |