From 846b11d8c834af4fa62393dadb490ea8246b332c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 2 Jul 2018 23:10:28 -0400 Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location In some cross build environments such as the Yocto Project build environment it provides an ncurses library that is compiled differently than the host's version. This causes display corruption problems when the host's curses includes are used instead of the includes from the provided compiler are overridden. There is a second case where there is no curses libraries at all on the host system and menuconfig will just fail entirely. The solution is simply to allow an override variable in check-lxdialog.sh for environments such as the Yocto Project. Adding a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing compiling and linking against the right headers and libraries. Stolen from linux-yocto [1] [1] http://git.yoctoproject.org/cgit.cgi/linux-yocto/commit/?id=846b11d8c834af4fa62393dadb490ea8246b332c Upstream-Status: Pending Signed-off-by: Jason Wessel cc: Michal Marek cc: linux-kbuild@vger.kernel.org Signed-off-by: Bruce Ashfield --- scripts/kconfig/mconf-cfg.sh | 8 ++++++++ 1 file changed, 8 insertions(+) mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh old mode 100755 new mode 100644 index c812872d7f9d..65a9b9e5b8a6 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -4,6 +4,14 @@ PKG="ncursesw" PKG2="ncurses" +if [ "$CROSS_CURSES_LIB" != "" ]; then + echo libs=\'$CROSS_CURSES_LIB\' + if [ x"$CROSS_CURSES_INC" != x ]; then + echo cflags=\'$CROSS_CURSES_INC\' + fi + exit 0 +fi + if [ -n "$(command -v pkg-config)" ]; then if pkg-config --exists $PKG; then echo cflags=\"$(pkg-config --cflags $PKG)\" -- 2.20.1