Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog

Timestamp:

Feb 25, 2011, 9:26:54 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

Location:

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog

Files:

• .gitignore (added)
• BIG.FAT.WARNING (modified) (1 diff)
• Makefile (modified) (1 diff)
• check-lxdialog.sh (modified) (3 diffs)

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/BIG.FAT.WARNING

@@ -1 +1 @@
 This is NOT the official version of dialog.  This version has been
-significantly modified from the original.  It is for use by the Linux
-busybox configuration script.  Please do not bother Savio Lam with
-questions about this program.
+significantly modified from the original.  It was used by the Linux
+kernel configuration script, and subsequently adapted for busybox.
+Please do not bother Savio Lam with questions about this program.

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/Makefile

@@ -13 +13 @@
 PHONY += dochecklxdialog
 $(obj)/dochecklxdialog:
-    $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
+    $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
 
 hostprogs-y := lxdialog

branches/2.2.9/mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh

@@ -5 +5 @@
 ldflags()
 {
-    $cc -print-file-name=libncursesw.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lncursesw'
-        exit
-    fi
-    $cc -print-file-name=libncurses.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lncurses'
-        exit
-    fi
-    $cc -print-file-name=libcurses.so | grep -q /
-    if [ $? -eq 0 ]; then
-        echo '-lcurses'
-        exit
-    fi
+    for ext in so a dylib ; do
+        for lib in ncursesw ncurses curses ; do
+            $cc -print-file-name=lib${lib}.${ext} | grep -q /
+            if [ $? -eq 0 ]; then
+                echo "-l${lib}"
+                exit
+            fi
+        done
+    done
     exit 1
 }
@@ -26 +20 @@
 ccflags()
 {
-    if [ -f /usr/include/ncurses/ncurses.h ]; then
+    if [ -f /usr/include/ncursesw/ncurses.h ]; then
+        echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"'
+    elif [ -f /usr/include/ncursesw/curses.h ]; then
+        echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+    elif [ -f /usr/include/ncurses/ncurses.h ]; then
         echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
     elif [ -f /usr/include/ncurses/curses.h ]; then
@@ -43 +41 @@
 # Check if we can link to ncurses
 check() {
-    echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
     if [ $? != 0 ]; then
-        echo " *** Unable to find the ncurses libraries."          1>&2
-        echo " *** make menuconfig require the ncurses libraries"  1>&2
-        echo " *** "                                               1>&2
-        echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
-        echo " *** "                                               1>&2
-        exit 1
+        echo " *** Unable to find the ncurses libraries or the"       1>&2
+        echo " *** required header files."                            1>&2
+        echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+        echo " *** "                                                  1>&2
+        echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+        echo " *** "                                                  1>&2
+        exit 1
     fi
 }
 
 usage() {
-    printf "Usage: $0 [-check compiler options|-header|-library]\n"
+    printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
 }
 
-if [ $# == 0 ]; then
+if [ $# -eq 0 ]; then
     usage
     exit 1