| Message ID | 1361988458-18486-2-git-send-email-jlec@gentoo.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Justin, All, On Wednesday 27 February 2013 jlec@gentoo.org wrote: > From: Justin Lecher <jlec@gentoo.org> > > 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 <jlec@gentoo.org> Ditto for the subject, as for your previous patch. > --- > scripts/kconfig/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile > index 3091794..7ddbf98 100644 > --- a/scripts/kconfig/Makefile > +++ b/scripts/kconfig/Makefile > @@ -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.
Hello, > > Long-line. What is the rule for Makefiles? It seems that 80 columns doesn't apply here. Thanks, Justin
Justin, All, On Thursday 28 February 2013 justin wrote: > > 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.
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 3091794..7ddbf98 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -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)