[PATCH]
PATCH 1/1 [PATCH]
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check /usr/include/ncursesw directory.
Add /usr/include/ncursesw to the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig".
---
* There is no /usr/include/ncurses/ directory but /usr/include/ncursesw exists, and has curses.h in it.
scripts/kconfig/lxdialog/check-lxdialog.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
scripts/kconfig/lxdialog/check-lxdialog.sh +2 -0
@@ -23,6 +23,8 @@ ccflags() 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
Quoted 11 lines · Junio C Hamano
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check
/usr/include/ncurseswdirectory.Add
/usr/include/ncurseswto the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig".Signed-off-by Junio C Hamano <[email protected]>
Except for the missing patch subject then it looks OK.
Suggested subject:
kconfig: fix menuconfig on debian lenny
Add as this is a fix we should Cc: <[email protected]>?
Sam
Quoted 11 lines · Sam Ravnborg
Quoted 10 lines · Junio C Hamano
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check
/usr/include/ncurseswdirectory.Add
/usr/include/ncurseswto the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig".
Quoted 5 lines
Quoted 1 line
Signed-off-by Junio C Hamano <[email protected]>Except for the missing patch subject then it looks OK. Suggested subject:
kconfig: fix menuconfig on debian lenny
Sorry, the missing subject really was sloppy of me, and thanks.
Quoted 1 line
Add as this is a fix we should Cc: <[email protected]>?
I don't think the fix deserves to be in stable. It does not look like 60f33b8 made it possible to use ncursesw on a box like mine so the patch is not evan an regression-fix.
Quoted 1 line
Acked-by Sam Ravnborg <[email protected]>
Thanks; is it my responsibility to follow-up the thread with identical patch with updated Subject and with your Ack, hoping somebody in kbuild team would pick it up?
Quoted 19 lines · Junio C Hamano
Quoted 11 lines · Sam Ravnborg
Quoted 10 lines · Junio C Hamano
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check
/usr/include/ncurseswdirectory.Add
/usr/include/ncurseswto the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig".Quoted 5 lines
Quoted 1 line
Signed-off-by Junio C Hamano <[email protected]>Except for the missing patch subject then it looks OK. Suggested subject:
kconfig: fix menuconfig on debian lenny
Quoted 7 lines
Sorry, the missing subject really was sloppy of me, and thanks.
Quoted 1 line
Add as this is a fix we should Cc: <[email protected]>?
I don't think the fix deserves to be in stable. It does not look like 60f33b8 made it possible to use ncursesw on a box like mine so the patch is not evan an regression-fix.
OK
Quoted 6 lines
Quoted 2 lines
Acked-by Sam Ravnborg <[email protected]>Thanks; is it my responsibility to follow-up the thread with identical patch with updated Subject and with your Ack, hoping somebody in kbuild team would pick it up?
I assume Michal will pick it up anyway - but if you do it would make it simpler for him to do so.
So no need..
Sam
Quoted 14 lines · Junio C Hamano
Quoted 13 lines · Sam Ravnborg
Quoted 11 lines · Junio C Hamano
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check
/usr/include/ncurseswdirectory.Add
/usr/include/ncurseswto the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig".Signed-off-by Junio C Hamano <[email protected]>
[...]
Quoted 6 lines
Quoted 2 lines
Acked-by Sam Ravnborg <[email protected]>Thanks; is it my responsibility to follow-up the thread with identical patch with updated Subject and with your Ack, hoping somebody in kbuild team would pick it up?
I fixed the subject line myself and applied it to kbuild-2.6.git#kconfig.
Thanks,
Michal