[PATCH] kconfig/nconf: fix compile with ncurses reentrant API

[PATCH] kconfig/nconf: fix compile with ncurses reentrant API

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

ESCDELAY is a global variable which is replaced by getter and setter
functions with NCURSES_REENTRANT.  This fixes the following error:

nconf.c: In function ‘main’:
nconf.c:1506:2: error: lvalue required as left operand of assignment

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
---
 scripts/kconfig/nconf.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 73070cb..eb9b87a 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1503,7 +1503,11 @@ int main(int ac, char **av)
 	}
 
 	notimeout(stdscr, FALSE);
+#if NCURSES_REENTRANT
+	set_escdelay(1);
+#else
 	ESCDELAY = 1;
+#endif
 
 	/* set btns menu */
 	curses_menu = new_menu(curses_menu_items);
-- 
1.7.9

[PATCH] kconfig: check ncursesw headers first in check-lxdialog

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for
ncursesw/curses.h for the case where ncurses and ncursesw are build
separately but only one is installed.  But if both are installed,
the headers ncurses/curses.h and ncursesw/curses.h differ, and since
libncursesw will be found first, so should ncursesw/curses.h.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
---
Also applies to all 3.x stable branches

 scripts/kconfig/lxdialog/check-lxdialog.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 82cc3a8..b75820b 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -19,12 +19,12 @@ ldflags()
 # Where is ncurses.h?
 ccflags()
 {
-	if [ -f /usr/include/ncurses/ncurses.h ]; then
+	if [ -f /usr/include/ncursesw/curses.h ]; then
+		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+	elif [ -f /usr/include/ncurses/ncurses.h ]; then
 		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
 	elif [ -f /usr/include/ncurses/curses.h ]; then
 		echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
-	elif [ -f /usr/include/ncursesw/curses.h ]; then
-		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
 	elif [ -f /usr/include/ncurses.h ]; then
 		echo '-DCURSES_LOC="<ncurses.h>"'
 	else
-- 
1.7.9

[PATCH] kconfig: fix check-lxdialog for DLL platforms

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

Import libraries on Cygwin and MinGW/MSYS use the .dll.a suffix, so
checking this suffix is necessary to make sure ncurses will still be
found when built without static libraries.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
---
Also applies to all 3.x stable branches

 scripts/kconfig/lxdialog/check-lxdialog.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index b75820b..e3b12c0 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,7 +4,7 @@
 # What library to link
 ldflags()
 {
-	for ext in so a dylib ; do
+	for ext in so a dll.a dylib ; do
 		for lib in ncursesw ncurses curses ; do
 			$cc -print-file-name=lib${lib}.${ext} | grep -q /
 			if [ $? -eq 0 ]; then
-- 
1.7.9

Re: [PATCH] kconfig/nconf: fix compile with ncurses reentrant API

[Michal Marek]

On Mon, Jun 11, 2012 at 07:29:41PM -0500, Yaakov (Cygwin/X) wrote:
> ESCDELAY is a global variable which is replaced by getter and setter
> functions with NCURSES_REENTRANT.  This fixes the following error:
> 
> nconf.c: In function ‘main’:
> nconf.c:1506:2: error: lvalue required as left operand of assignment

On Tue, Jun 12, 2012 at 07:05:02PM -0500, Yaakov (Cygwin/X) wrote:
> Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for
> ncursesw/curses.h for the case where ncurses and ncursesw are build
> separately but only one is installed.  But if both are installed,
> the headers ncurses/curses.h and ncursesw/curses.h differ, and since
> libncursesw will be found first, so should ncursesw/curses.h.

On Tue, Jun 12, 2012 at 07:05:15PM -0500, Yaakov (Cygwin/X) wrote:
> Import libraries on Cygwin and MinGW/MSYS use the .dll.a suffix, so
> checking this suffix is necessary to make sure ncurses will still be
> found when built without static libraries.

I applied these three to kbuild.git#kconfig. Sorry for the delay.

Michal