summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-03 22:16:56 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-03 22:16:56 (GMT)
commit128054d167e92886bc985f2b541daa4dd1181352 (patch)
tree3429fcb3f5efbc443145dc6fa05575727d207a77
parent04736bfc8599de812ee4954a06b8d7751fc7c182 (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)
-rw-r--r--kconfig/kconfig.mk11
-rw-r--r--kconfig/lxdialog/check-lxdialog.sh39
2 files changed, 21 insertions, 29 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)
diff --git a/kconfig/lxdialog/check-lxdialog.sh b/kconfig/lxdialog/check-lxdialog.sh
index a576d1c..fcef0f5 100644
--- a/kconfig/lxdialog/check-lxdialog.sh
+++ b/kconfig/lxdialog/check-lxdialog.sh
@@ -1,24 +1,14 @@
#!/bin/sh
# Check ncurses compatibility
-OS=`uname`
-
-# Under MACOS make sure that the macports-installed version is used.
-case "$OS" in
- Darwin) BASEDIR="/opt/local";;
- *) BASEDIR="/usr";;
-esac
-
-INCLUDEPATH="${BASEDIR}/include"
-LIBPATH="${BASEDIR}/lib"
-
# What library to link
ldflags()
{
for ext in so a dylib ; do
for lib in ncursesw ncurses curses ; do
- if [ -f "${LIBPATH}/lib${lib}.${ext}" ]; then
- echo "-L${LIBPATH} -l${lib}"
+ $cc -print-file-name=lib${lib}.${ext} | grep -q /
+ if [ $? -eq 0 ]; then
+ echo "-l${lib}"
exit
fi
done
@@ -29,20 +19,14 @@ ldflags()
# Where is ncurses.h?
ccflags()
{
- if [ -f "${INCLUDEPATH}/ncursesw/ncurses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<ncursesw/ncurses.h>\""
- elif [ -f "${INCLUDEPATH}/ncurses/ncurses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<ncurses/ncurses.h>\""
- elif [ -f "${INCLUDEPATH}/ncursesw/curses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<ncursesw/curses.h>\""
- elif [ -f "${INCLUDEPATH}/ncurses/curses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<ncurses/curses.h>\""
- elif [ -f "${INCLUDEPATH}/ncurses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<ncurses.h>\""
- elif [ -f "${INCLUDEPATH}/curses.h" ]; then
- echo "-I${INCLUDEPATH} \"-DCURSES_LOC=<curses.h>\""
+ if [ -f /usr/include/ncurses/ncurses.h ]; then
+ echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
+ elif [ -f /usr/include/ncurses/curses.h ]; then
+ echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+ elif [ -f /usr/include/ncurses.h ]; then
+ echo '-DCURSES_LOC="<ncurses.h>"'
else
- exit 1
+ echo '-DCURSES_LOC="<curses.h>"'
fi
}
@@ -52,8 +36,7 @@ trap "rm -f $tmp" 0 1 2 3 15
# Check if we can link to ncurses
check() {
- IF=`echo $(ccflags) | sed -e 's/"//g'`
- $cc $IF $(ldflags) -xc - -o $tmp 2>/dev/null <<'EOF'
+ $cc -xc - -o $tmp 2>/dev/null <<'EOF'
#include CURSES_LOC
main() {}
EOF