Use config scripts to detect ncurses libs for menuconfig
PATCH 1/2 Use config scripts to detect ncurses libs for menuconfig
From: Justin Lecher <[email protected]>
When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so.
Ncurses provides a config script (ncurses5-config) to assist finding ncurses. This patch makes use of it to detect the necessary libs for linking of the ncurses menuconfig dialog.
--- scripts/kconfig/lxdialog/check-lxdialog.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
scripts/kconfig/lxdialog/check-lxdialog.sh +16 -8
@@ -4,15 +4,23 @@ # What library to link ldflags() { - 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 - echo "-l${lib}" - exit - fi + if ncursesw5-config --libs >/dev/null 2>&1; then + ncursesw5-config --libs + exit + elif ncurses5-config --libs >/dev/null 2>&1; then + ncurses5-config --libs + exit + else + 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 + echo "-l${lib}" + exit + fi + done done - done + fi exit 1 }
Signature · 1 line
1.8.1.4
PATCH 2/2 Use config scripts to detect ncurses libs for nconfig
From: Justin Lecher <[email protected]>
When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so.
Ncurses provides a config script (ncurses5-config) to assist finding ncurses. This patch makes use of it to detect the necessary libs for linking of the ncurses nconfig dialog.
--- scripts/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/Makefile +1 -1
@@ -216,7 +216,7 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses +HOSTLOADLIBES_nconf = -lmenu -lpanel `ncursesw5-config --libs 2>/dev/null || ncurses5-config --libs 2>/dev/null` $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(qconf-target),1)
Signature · 1 line
1.8.1.4
Re: [PATCH 2/2] Use config scripts to detect ncurses libs for nconfig
Justin, All,
Quoted 11 lines · On Wednesday 27 February 2013 [email protected] wrote:
From: Justin Lecher <[email protected]>
When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so.
Ncurses provides a config script (ncurses5-config) to assist finding ncurses. This patch makes use of it to detect the necessary libs for linking of the ncurses nconfig dialog.
Signed-off-by Justin Lecher <[email protected]>
Ditto for the subject, as for your previous patch.
Quoted 9 lines
--- scripts/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/kconfig/Makefile +0
-0
scripts/kconfig/Makefile HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ · line 219
Quoted 5 lines
scripts/kconfig/Makefile +1
-1@@ -216,7 +216,7 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses +HOSTLOADLIBES_nconf = -lmenu -lpanel `ncursesw5-config --libs 2>/dev/null || ncurses5-config --libs 2>/dev/null`
Long-line. Also, this expands the ... in the shell, not in the Makefile. I'd rather have the expansion be done by the Makefile:
HOSTLOADLIBES_nconf = -lmenu -lpanel
HOSTLOADLIBES_nconf += $(shell ncursesw5-config --libs 2>/dev/null \ || ncurses5-config --libs 2>/dev/null )
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Re: [PATCH 2/2] Use config scripts to detect ncurses libs for nconfig
Hello,
Quoted 2 lines
Long-line.
What is the rule for Makefiles? It seems that 80 columns doesn't apply here.
Thanks,
Justin
Re: [PATCH 2/2] Use config scripts to detect ncurses libs for nconfig
Justin, All,
Quoted 2 lines · On Thursday 28 February 2013 justin wrote:
Quoted 1 line
Long-line.
What is the rule for Makefiles? It seems that 80 columns doesn't apply here.
If possible, I'd like to follow this rule, unless it proves too complex. In this case, I think it is possible and not too ugly. ;-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Justin, All,
Quoted 9 lines · On Wednesday 27 February 2013 [email protected] wrote:
When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so.
Ncurses provides a config script (ncurses5-config) to assist finding ncurses. This patch makes use of it to detect the necessary libs for linking of the ncurses menuconfig dialog.
Signed-off-by Justin Lecher <[email protected]>
Usually, patch subjects are of the form:
subsystem: subject
So I'd suggest the following subject:
kconfig/menuconfig: use config scripts to detect ncurses libs
That way, it makes it easy to see at first glance what the patch is about (kconfig/menuconfig), and what it achieves (use config scripts).
Quoted 15 lines
--- scripts/kconfig/lxdialog/check-lxdialog.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)scripts/kconfig/lxdialog/check-lxdialog.sh +0
-3@@ -4,15 +4,23 @@ # What library to link ldflags() { - 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 /
scripts/kconfig/lxdialog/check-lxdialog.sh line 12
Quoted 10 lines
scripts/kconfig/lxdialog/check-lxdialog.sh +6
-4- if [ $? -eq 0 ]; then - echo "-l${lib}" - exit - fi + if ncursesw5-config --libs >/dev/null 2>&1; then + ncursesw5-config --libs + exit + elif ncurses5-config --libs >/dev/null 2>&1; then + ncurses5-config --libs + exit
No need to run ncurses{,w}5-config twice each. Just do:
ncursesw5-config --libs 2>/dev/null && exit
ncurses5-config --libs 2>/dev/null && exit
[old code unchanged]This avoids an ugly re-indent of otherwise unchanged code.
On a side note: is the old code still useful, now we use the config scripts? In other words: are there cases where a ncurses install would not provide those scripts?
If the answer is 'no', then just trash the old code away.
I've just tested Debian Squeeze (stable for now), and Cygwin, and they both do provide ncurses{,w}5-config.
Quoted 4 lines
scripts/kconfig/lxdialog/check-lxdialog.sh +4
-0+ else + 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 /
scripts/kconfig/lxdialog/check-lxdialog.sh line 25
Quoted 10 lines
scripts/kconfig/lxdialog/check-lxdialog.sh +6
-1+ if [ $? -eq 0 ]; then + echo "-l${lib}" + exit + fi + done done - done + fi exit 1 }
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Hello,
Quoted 9 lines
On a side note: is the old code still useful, now we use the config scripts? In other words: are there cases where a ncurses install would not provide those scripts?
If the answer is 'no', then just trash the old code away.
I've just tested Debian Squeeze (stable for now), and Cygwin, and they both do provide ncurses{,w}5-config.
I looked into the ncurses releases back to 5.0. The first release containing is version 5.6 released in 2006. So I would guess we can assume that every system will have it.
justin
Justin, All,
Quoted 6 lines · On Thursday 28 February 2013 justin wrote:
Quoted 6 lines
On a side note: is the old code still useful, now we use the config scripts? In other words: are there cases where a ncurses install would not provide those scripts?
If the answer is 'no', then just trash the old code away.
Quoted 7 lines
Quoted 3 lines
I've just tested Debian Squeeze (stable for now), and Cygwin, and they both do provide ncurses{,w}5-config.
I looked into the ncurses releases back to 5.0. The first release containing is version 5.6 released in 2006. So I would guess we can assume that every system will have it.
Well, RHEL4 is still widely used, and it was released in 2005, so will not have ncurses-5.6 (updates may have it, but not everybody installs updates).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Quoted 5 lines · Yann E. MORIN
Well, RHEL4 is still widely used, and it was released in 2005, so will not have ncurses-5.6 (updates may have it, but not everybody installs updates).
Hi,
question, will such system be updated then to latest kernel sources? And if so, can't we require that for the ncurses based config menus need newer ncurses?
Justin
Justin, All,
Quoted 8 lines · On Thursday 28 February 2013 justin wrote:
Quoted 3 lines · Yann E. MORIN
Well, RHEL4 is still widely used, and it was released in 2005, so will not have ncurses-5.6 (updates may have it, but not everybody installs updates).
question, will such system be updated then to latest kernel sources? And if so, can't we require that for the ncurses based config menus need newer ncurses?
It's not that those systems will be updated to run the latest kernel, but rather that those systems can be used to build a newer kernel for another system (think eg. cross-compilation and embedded).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Quoted 4 lines · Yann E. MORIN
It's not that those systems will be updated to run the latest kernel, but rather that those systems can be used to build a newer kernel for another system (think eg. cross-compilation and embedded).
That's true, I will split the patches as suggested.
Jusitn