| From 7285996aa0006d671bb01f0d35991d254b2b2b01 Mon Sep 17 00:00:00 2001 |
| From: Brian Norris <computersforpeace@gmail.com> |
| Date: Wed, 4 Jun 2014 00:52:31 -0700 |
| Subject: kconfig: nconfig: fix multi-byte UTF handling |
| |
| Currently, Kconfig descriptions that use multi-byte UTF-8 characters |
| (such as MTD_NAND_CAFE) will have their menu entries dropped from the |
| 'make nconfig' ncurses menu, and all subsequent entries in the same |
| window will be omitted. This seems to be due to the ncurses 'menu' |
| library, which does not traditionally handle UTF-8 >8-bit characters |
| properly. |
| |
| The ncursesw library ('w' is for "wide") is written to handle these |
| UTF-8 characters, and is practically a drop-in replacement at the source |
| level. Use it by default, if available. |
| |
| Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067 |
| Signed-off-by: Brian Norris <computersforpeace@gmail.com> |
| Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> |
| Cc: Martin Walch <walch.martin@web.de> |
| Acked-by: Sam Ravnborg <sam@ravnborg.org> |
| Signed-off-by: Michal Marek <mmarek@suse.cz> |
| --- |
| scripts/kconfig/Makefile | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| (limited to 'scripts/kconfig/Makefile') |
| |
| diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile |
| index e7bf38e..c059385 100644 |
| --- a/scripts/kconfig/Makefile |
| +++ b/scripts/kconfig/Makefile |
| @@ -191,7 +191,8 @@ 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 = $(shell \ |
| - pkg-config --libs menu panel ncurses 2>/dev/null \ |
| + pkg-config --libs menuw panelw ncursesw 2>/dev/null \ |
| + || pkg-config --libs menu panel ncurses 2>/dev/null \ |
| || echo "-lmenu -lpanel -lncurses" ) |
| $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
| |
| -- |
| cgit v1.1 |
| |
