With this patch when ncurses-devel (or whatever it is named) is missing trying to run menuconfig will result in this: $ make menuconfig HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/kxgettext.o *** Unable to find the ncurses libraries or the *** required header files. *** 'make menuconfig' requires the ncurses libraries. *** *** Install ncurses (ncurses-devel) and try again. *** make[1]: *** [scripts/kconfig/dochecklxdialog] Error 1 make: *** [menuconfig] Error 2 Much better than before where we just listed some build errors. The other *config targets will work indepenednt on ncurses being present or not. Includes improvements suggested by: Frans Pop <elendil@planet.nl>
Showing the changes to scripts (2 of 2 files). Show all
Unified · Split
| @@ -93,12 +93,6 @@ HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) · 92 unmodified lines | ||
| 93 | 93 | |
| 94 | 94 | HOST_EXTRACFLAGS += -DLOCALE |
| 95 | 95 | |
| 96 | −PHONY += $(obj)/dochecklxdialog | |
| 97 | −$(obj)/dochecklxdialog: | |
| 98 | − $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES) | |
| 99 | − | |
| 100 | −always := dochecklxdialog | |
| 101 | − | |
| 102 | 96 | |
| 103 | 97 | # =========================================================================== |
| 104 | 98 | # Shared Makefile for the various kconfig executables: |
| @@ -145,6 +139,14 @@ clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ · 40 unmodified lines | ||
| 145 | 139 | .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c |
| 146 | 140 | clean-files += mconf qconf gconf |
| 147 | 141 | |
| 142 | +# Check that we have the required ncurses stuff installed for lxdialog (menuconfig) | |
| 143 | +PHONY += $(obj)/dochecklxdialog | |
| 144 | +$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog | |
| 145 | +$(obj)/dochecklxdialog: | |
| 146 | + $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) | |
| 147 | + | |
| 148 | +always := dochecklxdialog | |
| 149 | + | |
| 148 | 150 | # Add environment specific flags |
| 149 | 151 | HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) |
| 150 | 152 | |
| @@ -36,14 +36,16 @@ trap "rm -f $tmp" 0 1 2 3 15 · 35 unmodified lines | ||
| 36 | 36 | |
| 37 | 37 | # Check if we can link to ncurses |
| 38 | 38 | check() { |
| 39 | − echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null | |
| 39 | + echo -e " #include CURSES_LOC \n main() {}" | | |
| 40 | + $cc -xc - -o $tmp 2> /dev/null | |
| 40 | 41 | if [ $? != 0 ]; then |
| 41 | − echo " *** Unable to find the ncurses libraries." 1>&2 | |
| 42 | − echo " *** make menuconfig require the ncurses libraries" 1>&2 | |
| 43 | − echo " *** " 1>&2 | |
| 44 | − echo " *** Install ncurses (ncurses-devel) and try again" 1>&2 | |
| 45 | − echo " *** " 1>&2 | |
| 46 | − exit 1 | |
| 42 | + echo " *** Unable to find the ncurses libraries or the" 1>&2 | |
| 43 | + echo " *** required header files." 1>&2 | |
| 44 | + echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2 | |
| 45 | + echo " *** " 1>&2 | |
| 46 | + echo " *** Install ncurses (ncurses-devel) and try again." 1>&2 | |
| 47 | + echo " *** " 1>&2 | |
| 48 | + exit 1 | |
| 47 | 49 | fi |
| 48 | 50 | } |
| 49 | 51 | |