| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9b2db90b0912082222x5287d452pf9e55d6ff44e511c@mail.gmail.com>
Date: Wed, 9 Dec 2009 08:22:38 +0200
From: Nir Tzachar <nir.tzachar@...il.com>
To: Michal Marek <mmarek@...e.cz>
Cc: Arkadiusz Miskiewicz <a.miskiewicz@...il.com>,
linux-kernel@...r.kernel.org, linux-kbuild@...r.kernel.org
Subject: Re: [PATCH] MAINTAINERS: new kbuild maintainer
Hello.
On Tue, Dec 8, 2009 at 10:24 PM, Michal Marek <mmarek@...e.cz> wrote:
> Arkadiusz Miskiewicz napsal(a):
>> On Tuesday 08 of December 2009, Michal Marek wrote:
>>> Arkadiusz Miskiewicz napsal(a):
>>>> Maybe we can get colors back in menuconfig then? ;-)
>>>> http://bugzilla.kernel.org/show_bug.cgi?id=13677
>>> Does it also happen with Nir's nconfig
>>> (http://lkml.org/lkml/2009/11/25/119)?
>>
>> Yes, it does happen, I have non-color menus. That's because nconfig also mixes
>> wide ncurses library with non wide ncurses headers.
>>
>> gcc -Wp,-MD,scripts/kconfig/.nconf.o.d -Wall -Wmissing-prototypes -Wstrict-
>> prototypes -O2 -fomit-frame-pointer -I/usr/include/ncurses -
>> DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/nconf.o
>> scripts/kconfig/nconf.c
>>
>> /usr/include/ncurses is non wide version of ncurses headers (but on other
>> distros it could be done differently aka /usr/include/ncures being wide
>> version)
>>
>> gcc -o scripts/kconfig/nconf scripts/kconfig/nconf.o
>> scripts/kconfig/zconf.tab.o scripts/kconfig/nconf.gui.o -lncursesw -lmenu -
>> lpanel -lncurses
>>
>> and here it's linked to non wide version of library (also to wide, too due to
>> scripts/kconfig/lxdialog/check-lxdialog.sh putting it here)
>>
>> Anyway way to solve this is:
>> - detect if ncurses header is wide or non-wide
>> - link with proper ncurses library based on detected header
>
> Nir, you surely know ncurses better than me :). Could you look into
> this? Arkadiusz, which distribution are you using?
>
> Michal
>
Well, I see the problem, but it does not manifest on my machines.
The thing is that lxdialog/check-lxdialog.sh always adds ncursesw to
the library path, even if the narrow version exists. I believe this is
set so that if there is only an installation of ncursesw everything
will work fine. However, it does not take into account that on most
systems (at least those I have seen) both of the versions are
installed.
As nconfig does not use any wide version function, and I believe
lxdialog does not also, I think we can remove ncursesw from the
libraries.
Arkadiusz, do the patch below help?
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh
b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f5..5596d0c 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -5,7 +5,7 @@
ldflags()
{
for ext in so a dylib ; do
- for lib in ncursesw ncurses curses ; do
+ for lib in ncurses curses ; do
$cc -print-file-name=lib${lib}.${ext} | grep -q /
if [ $? -eq 0 ]; then
echo "-l${lib}"
Moreover, currently nconfig does not use this check. It should be made
common to both mconf and nconf, and we need to make sure adding the
appropriate libraries only to the targets which need them (currently,
-lncurses is added to all targets in scripts/kbuild ...) Below is a
very hackish patch which does this. However, having a proper Makefile
for lxdialog would be much better.
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 6d69c7c..e0c7714 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -23,6 +23,9 @@ menuconfig: $(obj)/mconf
config: $(obj)/conf
$< $(Kconfig)
+nconfig: $(obj)/nconf
+ $< $(Kconfig)
+
oldconfig: $(obj)/conf
$< -o $(Kconfig)
@@ -109,6 +112,7 @@ endif
# Help text used by make help
help:
@echo ' config - Update current config utilising a line-oriented program'
+ @echo ' nconfig - Update current config utilising a
ncurses menu based program'
@echo ' menuconfig - Update current config utilising a menu based program'
@echo ' xconfig - Update current config utilising a QT based front-end'
@echo ' gconfig - Update current config utilising a GTK based front-end'
@@ -127,8 +131,8 @@ check-lxdialog :=
$(srctree)/$(src)/lxdialog/check-lxdialog.sh
# Use recursively expanded variables so we do not call gcc unless
# we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags
$(HOSTCC))
+NCURSESCFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+NCURSESLIBS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
HOST_EXTRACFLAGS += -DLOCALE
@@ -136,6 +140,8 @@ HOST_EXTRACFLAGS += -DLOCALE
# ===========================================================================
# Shared Makefile for the various kconfig executables:
# conf: Used for defconfig, oldconfig and related targets
+# nconf: Used for the nconfig target.
+# Utilizes ncurses
# mconf: Used for the menuconfig target
# Utilizes the lxdialog package
# qconf: Used for the xconfig target
@@ -147,12 +153,30 @@ HOST_EXTRACFLAGS += -DLOCALE
lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
+HOSTCFLAGS_checklist.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_util.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_inputbox.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_textbox.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_yesno.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_menubox.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_mconf.o = $(NCURSESCFLAGS)
+
+HOSTCFLAGS_nconf.gui.o = $(NCURSESCFLAGS)
+HOSTCFLAGS_nconf.o = $(NCURSESCFLAGS)
+
+HOSTLOADLIBES_mconf = $(NCURSESLIBS)
+
conf-objs := conf.o zconf.tab.o
-mconf-objs := mconf.o zconf.tab.o $(lxdialog)
+mconf-objs := mconf.o zconf.tab.o $(lxdialog)
+nconf-objs := nconf.o zconf.tab.o nconf.gui.o
kxgettext-objs := kxgettext.o zconf.tab.o
hostprogs-y := conf qconf gconf kxgettext
+ifeq ($(MAKECMDGOALS),nconfig)
+ hostprogs-y += nconf
+endif
+
ifeq ($(MAKECMDGOALS),menuconfig)
hostprogs-y += mconf
endif
@@ -176,14 +200,14 @@ endif
clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
.tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
-clean-files += mconf qconf gconf
+clean-files += mconf qconf gconf nconf
clean-files += config.pot linux.pot
# Check that we have the required ncurses stuff installed for
lxdialog (menuconfig)
PHONY += $(obj)/dochecklxdialog
$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
$(obj)/dochecklxdialog:
- $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC)
$(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
+ $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC)
$(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) $(NCURSESCFLAGS) $(NCURSESLIBS)
always := dochecklxdialog
@@ -201,6 +225,7 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0
gmodule-2.0 libglade-2.0`
HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-D LKC_DIRECT_LINK
+HOSTLOADLIBES_nconf = -lmenu -lpanel $(NCURSESLIBS)
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
ifeq ($(qconf-target),1)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists