aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2006-01-15 09:28:35 -0500
committerSam Ravnborg <sam@mars.ravnborg.org>2006-01-15 09:28:35 -0500
commit60f33b80443a3e7e79e2a3ddc625ab6246a61d3d (patch)
tree941dd2cb141fd7db86e071a0c469aaba9d22599b /scripts/kconfig
parent7c7dce9209161eb260cdf9e9172f72c3a02379e6 (diff)
kconfig: get rid of stray a.o, support ncursesw
scripts/kconfig/lxdialog/check-lxdialog.sh uses gcc to check for what libraries are present. Redirect output to /dev/null so we do not generate an a.out. Also included support for ncursesw - so if present prefer that instead of ncurses. The order is now (first is preferred): 1) ncursesw 2) ncurses 3) curses The latter is to support SunOS. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/lxdialog/Makefile6
-rw-r--r--scripts/kconfig/lxdialog/check-lxdialog.sh23
2 files changed, 21 insertions, 8 deletions
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
index 8f41d9a57aaa..fae3e29fc924 100644
--- a/scripts/kconfig/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
@@ -1,9 +1,9 @@
1# Makefile to build lxdialog package 1# Makefile to build lxdialog package
2# 2#
3 3
4check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh 4check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh
5HOST_EXTRACFLAGS := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) 5HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
6HOST_LOADLIBES := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags) 6HOST_LOADLIBES := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
7 7
8HOST_EXTRACFLAGS += -DLOCALE 8HOST_EXTRACFLAGS += -DLOCALE
9 9
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index a3c141b49670..448e353923f3 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,11 +4,22 @@
4# What library to link 4# What library to link
5ldflags() 5ldflags()
6{ 6{
7 if [ `uname` == SunOS ]; then 7 echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
8 echo '-lcurses' 8 if [ $? -eq 0 ]; then
9 else 9 echo '-lncursesw'
10 exit
11 fi
12 echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
13 if [ $? -eq 0 ]; then
10 echo '-lncurses' 14 echo '-lncurses'
15 exit
11 fi 16 fi
17 echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
18 if [ $? -eq 0 ]; then
19 echo '-lcurses'
20 exit
21 fi
22 exit 1
12} 23}
13 24
14# Where is ncurses.h? 25# Where is ncurses.h?
@@ -28,7 +39,7 @@ ccflags()
28compiler="" 39compiler=""
29# Check if we can link to ncurses 40# Check if we can link to ncurses
30check() { 41check() {
31 echo "main() {}" | $compiler -xc - 42 echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
32 if [ $? != 0 ]; then 43 if [ $? != 0 ]; then
33 echo " *** Unable to find the ncurses libraries." 1>&2 44 echo " *** Unable to find the ncurses libraries." 1>&2
34 echo " *** make menuconfig require the ncurses libraries" 1>&2 45 echo " *** make menuconfig require the ncurses libraries" 1>&2
@@ -51,13 +62,15 @@ fi
51case "$1" in 62case "$1" in
52 "-check") 63 "-check")
53 shift 64 shift
54 compiler="$@" 65 cc="$@"
55 check 66 check
56 ;; 67 ;;
57 "-ccflags") 68 "-ccflags")
58 ccflags 69 ccflags
59 ;; 70 ;;
60 "-ldflags") 71 "-ldflags")
72 shift
73 cc="$@"
61 ldflags 74 ldflags
62 ;; 75 ;;
63 "*") 76 "*")