diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2010-08-16 00:19:04 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-08-17 04:35:40 -0400 |
commit | 7080e47bb2783c04982526068204c1c8fc2c4c38 (patch) | |
tree | 15e8735ba495c6ed03493150a940c4fcd2fd763e /scripts/kconfig | |
parent | 94bedeca77bf79a81952ed4c3abb8c1cce4c85dd (diff) |
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: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index de934def410f..7522a8bc0553 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -146,7 +146,6 @@ check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh | |||
146 | # Use recursively expanded variables so we do not call gcc unless | 146 | # Use recursively expanded variables so we do not call gcc unless |
147 | # we really need to do so. (Do not call gcc as part of make mrproper) | 147 | # we really need to do so. (Do not call gcc as part of make mrproper) |
148 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) | 148 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) |
149 | HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | ||
150 | 149 | ||
151 | HOST_EXTRACFLAGS += -DLOCALE | 150 | HOST_EXTRACFLAGS += -DLOCALE |
152 | 151 | ||
@@ -208,7 +207,7 @@ clean-files += config.pot linux.pot | |||
208 | PHONY += $(obj)/dochecklxdialog | 207 | PHONY += $(obj)/dochecklxdialog |
209 | $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog | 208 | $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog |
210 | $(obj)/dochecklxdialog: | 209 | $(obj)/dochecklxdialog: |
211 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) | 210 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf) |
212 | 211 | ||
213 | always := dochecklxdialog | 212 | always := dochecklxdialog |
214 | 213 | ||
@@ -226,6 +225,8 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl | |||
226 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 225 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
227 | -D LKC_DIRECT_LINK | 226 | -D LKC_DIRECT_LINK |
228 | 227 | ||
228 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | ||
229 | |||
229 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses | 230 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses |
230 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 231 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
231 | 232 | ||