diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-10-03 22:16:56 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-10-03 22:16:56 (GMT) |
| commit | 128054d167e92886bc985f2b541daa4dd1181352 (patch) | |
| tree | 3429fcb3f5efbc443145dc6fa05575727d207a77 /kconfig/kconfig.mk | |
| parent | 04736bfc8599de812ee4954a06b8d7751fc7c182 (diff) | |
kconfig: resync curses check with Linux kernel
check-lxdialog.sh breaks on 64-bit distributions which are lacking
the lib -> lib64 symlinks (eg. some Fedora).
The script from the 2.6.35 Linux kernel is reportedly functional
on the systems that were requiring the current hack. See:
http://sourceware.org/ml/crossgcc/2010-09/msg00113.html
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4009fc9c47d5d2c4e7765f1e9fb6721a87217ae5)
Diffstat (limited to 'kconfig/kconfig.mk')
| -rw-r--r-- | kconfig/kconfig.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk index 26304e1..be8e517 100644 --- a/kconfig/kconfig.mk +++ b/kconfig/kconfig.mk @@ -73,7 +73,11 @@ INTL_CFLAGS = $(shell $(SHELL) $(check_gettext) $(HOST_CC) $(EXTRA_CFLAGS)) # Compiler and linker flags to use ncurses NCURSES_CFLAGS = $(shell $(SHELL) $(check_lxdialog) -ccflags) -NCURSES_LDFLAGS = $(shell $(SHELL) $(check_lxdialog) -ldflags $(HOST_CC) $(LX_FLAGS) $(EXTRA_CFLAGS)) +NCURSES_LDFLAGS = $(shell $(SHELL) $(check_lxdialog) -ldflags $(HOST_CC)) + +# Check that we have the required ncurses stuff installed for lxdialog (menuconfig) +dochecklxdialog: + $(SILENT)$(SHELL) $(check_lxdialog) -check $(HOST_CC) $(NCURSES_CFLAGS) $(NCURSES_LDFLAGS) # Common source files COMMON_SRC = kconfig/zconf.tab.c @@ -113,6 +117,8 @@ ALL_DEPS = $(sort $(COMMON_DEP) $(LX_DEP) $(conf_DEP) $(mconf_DEP)) # We must be carefull what we enclose, because we need some of the variable # definitions for clean (and distclean) at least. # Just protecting the "-include $(DEPS)" line should be sufficient. +# And in case we want menuconfig, we have to check that lxdialog +# can find a curses lib. ifneq ($(strip $(MAKECMDGOALS)),) ifneq ($(strip $(filter $(configurators),$(MAKECMDGOALS))),) @@ -123,6 +129,9 @@ DEPS += $(conf_DEP) endif ifneq ($(strip $(filter menuconfig,$(MAKECMDGOALS))),) DEPS += $(mconf_DEP) $(LX_DEP) +$(COMMON_OBJ) $(COMMON_DEP): |dochecklxdialog +$(LX_OBJ) $(LX_DEP): |dochecklxdialog +$(mconf_OBJ) $(mconf_DEP): |dochecklxdialog endif -include $(DEPS) |