Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7080e47b authored by Arnaud Lacombe's avatar Arnaud Lacombe Committed by Michal Marek
Browse files

kbuild: don't include `check-lxdialog' ldflags in global HOST_LOADLIBES 



On BSD systems, `check-lxdialog' would select -lcurses as the default
curses library which would conflict with -lncurses at runtime: curses'
compatible symbols are getting handled by the system's curses library while the
ncurses-specific symbols are getting handled by the ports' ncurses.

This fixes `nconf' segmentation fault on these systems.

Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 94bedeca

scripts/kconfig/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 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))



HOST_EXTRACFLAGS += -DLOCALE
@@ -208,7 +207,7 @@ clean-files += config.pot linux.pot 
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) $(HOSTLOADLIBES_mconf)



always := dochecklxdialog
@@ -226,6 +225,8 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl 
HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \

                          -D LKC_DIRECT_LINK



HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))



HOSTLOADLIBES_nconf	= -lmenu -lpanel -lncurses

$(obj)/qconf.o: $(obj)/.tmp_qtcheck