Mailing-List:	contact cygwin-apps-help AT sourceware DOT cygnus DOT com; run by ezmlm
list-help:	<mailto:cygwin-apps-help AT sourceware DOT cygnus DOT com>
list-post:	<mailto:cygwin-apps AT sourceware DOT cygnus DOT com>
Sender:	cygwin-apps-owner AT sourceware DOT cygnus DOT com
Delivered-To:	mailing list cygwin-apps AT sourceware DOT cygnus DOT com
Date:	26 May 2000 09:52:31 +0000
Discarded-X400-MTS-Extensions:	(43) (12) (2) (135) (115) (5) (6) (3)
From:	"Michael Ring" <Michael DOT Ring AT t-mobil DOT de>
To:	"cygwin-apps AT sourceware DOT cygnus DOT com" <cygwin-apps AT sourceware DOT cygnus DOT com>
Subject:	Additional Patch for bash
Importance:	normal
Autoforwarded:	FALSE
Message-Id:	<C1640IMC2JR8M*@MHS>
Original-Encoded-Information-Types:	(1) (0) (10021) (7) (1) (0) (6), (1) (0) (10021) (7) (1) (0) (1)

The Source version of bash works fine until a 

libtoolize --copy --force

is issued. The config.guess included in bash is very old and unfortunately the
configure script for bash still relies on cygwin32 beeing set instead of cygwin.

If you build bash after libtoolize the resulting bash stackdumps.

Here's the fix:


diff -Naur bash-2.04_o/configure bash-2.04/configure
--- bash-2.04_o/configure       Tue Feb 22 16:46:17 2000
+++ bash-2.04/configure Fri May 26 09:07:51 2000
@@ -675,7 +675,7 @@
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross

-ac_exeext=
+ac_exeext=.exe
 ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi AT caip DOT rutgers DOT edu.
@@ -770,7 +770,7 @@
 *-machten4)    opt_bash_malloc=no ;;   # MachTen 4.x
 *-bsdi2.1|*-bsdi3.?)   opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable
builtins
 *-beos*)       opt_bash_malloc=no ;;   # they say it's suitable
-*-cygwin32*)   opt_bash_malloc=no ;;   # Cygnus's CYGWIN32 environment
+*-cygwin*)     opt_bash_malloc=no ;;   # Cygnus's CYGWIN32 environment
 esac

 # Check whether --with-afs or --without-afs was given.
@@ -1693,7 +1693,7 @@

 if test "x$cross_compiling" = "xyes"; then
     case "${host}" in
-    *-cygwin32*)
+    *-cygwin*)
        cross_cache=${srcdir}/cross-build/cygwin32.cache
        SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
        ;;
@@ -8062,7 +8062,7 @@
 linux*)                LOCAL_LDFLAGS=-rdynamic ;;       # allow dynamic loading
 *qnx*)         LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses"
;;
 powerux*)      LOCAL_LIBS="-lgen" ;;
-cygwin32*)     LOCAL_LIBS="-luser32" ;;
+cygwin*)       LOCAL_LIBS="-luser32" ;;
 opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
 esac

diff -Naur bash-2.04_o/configure.in bash-2.04/configure.in
--- bash-2.04_o/configure.in    Tue Feb 22 16:46:11 2000
+++ bash-2.04/configure.in      Fri May 26 09:09:06 2000
@@ -53,7 +53,7 @@
 *-machten4)    opt_bash_malloc=no ;;   # MachTen 4.x
 *-bsdi2.1|*-bsdi3.?)   opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable
builtins
 *-beos*)       opt_bash_malloc=no ;;   # they say it's suitable
-*-cygwin32*)   opt_bash_malloc=no ;;   # Cygnus's CYGWIN32 environment
+*-cygwin*)     opt_bash_malloc=no ;;   # Cygnus's CYGWIN32 environment
 esac

 dnl arguments to configure
@@ -283,7 +283,7 @@

 if test "x$cross_compiling" = "xyes"; then
     case "${host}" in
-    *-cygwin32*)
+    *-cygwin*)
        cross_cache=${srcdir}/cross-build/cygwin32.cache
        SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
        ;;
@@ -692,7 +692,7 @@
 linux*)                LOCAL_LDFLAGS=-rdynamic ;;       # allow dynamic loading
 *qnx*)         LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses"
;;
 powerux*)      LOCAL_LIBS="-lgen" ;;
-cygwin32*)     LOCAL_LIBS="-luser32" ;;
+cygwin*)       LOCAL_LIBS="-luser32" ;;
 opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
 esac

- Raw text -