2004-10-27 22:02:20

by Tom Rini

[permalink] [raw]
Subject: [PATCH 2.6.9] Fix menuconfig on Solaris

Something occured to me after I sent my first round of Solaris patches,
people might want to use 'menuconfig' not just config/oldconfig. The
following two bits are needed to get it working (not as colorful as on
Linux, but it functions) for me. First, unless CURS_MACROS is defined,
scroll(x) doesn't get expanded to wscrl(x, 1). I did some quick
grepping on Cygwin and Linux (debian/unstable) and didn't see
CURS_MACROS show up anywhere else, but to be safe I put it inside of
__sun__. Next this uses libcurses instead of libncurses otherwise we
get a bunch of undefined refs to w32attrset, w32addch, acs32map and few
more.

Signed-off-by: Tom Rini <[email protected]>

--- linux-2.6.9.orig/scripts/lxdialog/dialog.h
+++ linux-2.6.9/scripts/lxdialog/dialog.h
@@ -26,6 +26,9 @@
#include <stdlib.h>
#include <string.h>

+#ifdef __sun__
+#define CURS_MACROS
+#endif
#include CURSES_LOC

/*
--- linux-2.6.9.orig/scripts/lxdialog/Makefile
+++ linux-2.6.9/scripts/lxdialog/Makefile
@@ -1,5 +1,9 @@
HOST_EXTRACFLAGS := -DLOCALE
+ifeq ($(shell uname),SunOS)
+HOST_LOADLIBES := -lcurses
+else
HOST_LOADLIBES := -lncurses
+endif

ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
HOST_EXTRACFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"

--
Tom Rini
http://gate.crashing.org/~trini/


2004-10-30 20:15:37

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [PATCH 2.6.9] Fix menuconfig on Solaris

On Wed, Oct 27, 2004 at 02:48:00PM -0700, Tom Rini wrote:
> Something occured to me after I sent my first round of Solaris patches,
> people might want to use 'menuconfig' not just config/oldconfig.

Applied,

Sam