Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-009.configure.patch
changeset 1082 6d49548fa9da
parent 115 c360825c3a3f
child 1275 03b86a2f9021 
--- a/components/bash/patches/solaris-009.configure.patch	Wed Dec 12 12:18:23 2012 -0800
+++ b/components/bash/patches/solaris-009.configure.patch	Thu Dec 13 15:52:21 2012 -0800
@@ -1,11 +1,11 @@
---- configure	2009-12-29 05:34:51.000000000 -0800
-+++ configure	2010-09-01 10:45:06.225859891 -0700
+--- configure	2011-02-07 14:03:22.000000000 -0800
++++ configure	2011-11-14 10:38:12.200623852 -0800
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /bin/bash
- # From configure.in for Bash 4.1, version 4.019.
+ # From configure.in for Bash 4.2, version 4.037.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for bash 4.1-release.
+ # Generated by GNU Autoconf 2.63 for bash 4.2-release.
 @@ -13,6 +13,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -24,16 +24,7 @@
  
  # Identity of this package.
  PACKAGE_NAME='bash'
-@@ -3500,7 +3502,7 @@
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
--   CFLAGS="-g"
-+   CFLAGS=""
-    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3579,7 +3581,7 @@
+@@ -3498,7 +3500,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -42,7 +33,7 @@
  	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -3638,7 +3640,7 @@
+@@ -3557,7 +3559,7 @@
    if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
@@ -51,16 +42,7 @@
    fi
  else
    if test "$GCC" = yes; then
-@@ -5092,7 +5094,7 @@
- 
- if test -z "$CC_FOR_BUILD"; then
-     if test "x$cross_compiling" = "xno"; then
--	CC_FOR_BUILD='$(CC)'
-+	CC_FOR_BUILD='$(CC) $(CPPFLAGS) $(CFLAGS)'
-     else
- 	CC_FOR_BUILD=gcc
-     fi
-@@ -5100,7 +5102,7 @@
+@@ -5019,7 +5021,7 @@
  
  
  
@@ -69,7 +51,7 @@
  
  test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O2"
  
-@@ -5132,7 +5134,7 @@
+@@ -5051,7 +5053,7 @@
  	LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-""}
  fi
  
@@ -78,14 +60,14 @@
  
  
  
-@@ -5257,9 +5259,14 @@
+@@ -5176,9 +5178,14 @@
  int
  main ()
  {
-+#if defined(sun) || defined(__sun) || defined(__sun__)
-+#error "we want to use libcurses."
-+return 255;
-+#else
++    #if defined(sun) || defined(__sun) || defined(__sun__)
++    #error "we want to use libcurses."
++    return 255;
++    #else
  return tgetent ();
    ;
    return 0;
@@ -93,7 +75,7 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -6164,7 +6171,7 @@
+@@ -6083,7 +6090,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
@@ -102,16 +84,18 @@
  all:
  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
-@@ -6190,7 +6197,7 @@
+@@ -6108,8 +6115,8 @@
+ 
  
  case "$host_os" in
- opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
+-opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
 -*)			MAKE_SHELL=/bin/sh ;;
++opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/bash" ;;
 +*)			MAKE_SHELL=/bin/bash ;;
  esac
  
  
-@@ -7177,7 +7184,7 @@
+@@ -7096,7 +7103,7 @@
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
@@ -120,7 +104,7 @@
    echo  "exit 0"   >>conf$$.sh
    chmod +x conf$$.sh
    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7191,7 +7198,7 @@
+@@ -7110,7 +7117,7 @@
  # Find out how to test for executable files. Don't use a zero-byte file,
  # as systems may use methods other than mode bits to determine executability.
  cat >conf$$.file <<_ASEOF
@@ -129,7 +113,7 @@
  exit 0
  _ASEOF
  chmod +x conf$$.file
-@@ -7288,7 +7295,7 @@
+@@ -7207,7 +7214,7 @@
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
@@ -138,7 +122,7 @@
    echo  "exit 0"   >>conf$$.sh
    chmod +x conf$$.sh
    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7302,7 +7309,7 @@
+@@ -7221,7 +7228,7 @@
  # Find out how to test for executable files. Don't use a zero-byte file,
  # as systems may use methods other than mode bits to determine executability.
  cat >conf$$.file <<_ASEOF
@@ -147,7 +131,7 @@
  exit 0
  _ASEOF
  chmod +x conf$$.file
-@@ -7359,7 +7366,7 @@
+@@ -7278,7 +7285,7 @@
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
@@ -156,7 +140,7 @@
    echo  "exit 0"   >>conf$$.sh
    chmod +x conf$$.sh
    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7373,7 +7380,7 @@
+@@ -7292,7 +7299,7 @@
  # Find out how to test for executable files. Don't use a zero-byte file,
  # as systems may use methods other than mode bits to determine executability.
  cat >conf$$.file <<_ASEOF
@@ -165,7 +149,7 @@
  exit 0
  _ASEOF
  chmod +x conf$$.file
-@@ -8992,7 +8999,7 @@
+@@ -8911,7 +8918,7 @@
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
@@ -174,7 +158,7 @@
    echo  "exit 0"   >>conf$$.sh
    chmod +x conf$$.sh
    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -9102,7 +9109,7 @@
+@@ -9021,7 +9028,7 @@
  else
  
      CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -183,7 +167,7 @@
      . ./conftest.sh
      rm -f ./conftest.sh
      acl_cv_rpath=done
-@@ -13042,39 +13049,18 @@
+@@ -12962,39 +12969,19 @@
  /* end confdefs.h.  */
  /* Define isinf to an innocuous variant, in case <limits.h> declares isinf.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -201,7 +185,7 @@
 -#endif
 -
 -#undef isinf
--
+ 
 +#include <math.h>
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
@@ -221,11 +205,11 @@
  main ()
  {
 -return isinf ();
-+return isinf(0.0);
++return isinf (0.0);
    ;
    return 0;
  }
-@@ -13134,39 +13120,26 @@
+@@ -13054,39 +13041,25 @@
  /* end confdefs.h.  */
  /* Define isnan to an innocuous variant, in case <limits.h> declares isnan.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -252,7 +236,6 @@
 -extern "C"
 -#endif
 -char isnan ();
-+
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
@@ -264,11 +247,11 @@
  main ()
  {
 -return isnan ();
-+return isnan(0.0);
++return isnan (0.0);
    ;
    return 0;
  }
-@@ -25521,7 +25494,7 @@
+@@ -25754,7 +25727,7 @@
  exit 69
  ' >conftest
  chmod u+x conftest
@@ -277,12 +260,65 @@
  if test $? -ne 69; then
     ac_cv_sys_interpreter=yes
  else
-@@ -30117,9 +30090,14 @@
+@@ -30777,28 +30750,17 @@
+ /* end confdefs.h.  */
+ /* Define tgetent to an innocuous variant, in case <limits.h> declares tgetent.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define tgetent innocuous_tgetent
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char tgetent (); below.
+     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+     <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef tgetent
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char tgetent ();
++
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+@@ -30809,9 +30771,14 @@
  int
  main ()
  {
 +#if defined(sun) || defined(__sun) || defined(__sun__)
-+#error "we want to use libcurses"
++#error "we want to use libcurses."
++return 255;
++#else
+ return tgetent ();
+   ;
+   return 0;
++#endif
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -30869,16 +30836,18 @@
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char tgetent ();
++
+ int
+ main ()
+ {
++#if defined(sun) || defined(__sun) || defined(__sun__)
++#error "we want to use libcurses."
 +return 255;
 +#else
  return tgetent ();
@@ -292,7 +328,30 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -30302,7 +30280,7 @@
+@@ -30937,16 +30906,18 @@
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char tgetent ();
++
+ int
+ main ()
+ {
++#if defined(sun) || defined(__sun) || defined(__sun__)
++#error "we want to use libcurses."
++return 255;
++#else
+ return tgetent ();
+   ;
+   return 0;
++#endif
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -30994,7 +30965,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -301,7 +360,46 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -30468,7 +30446,7 @@
+@@ -31002,13 +30973,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#include <curses.h>
++#include <term.h>
++
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char tgetent ();
+ int
+ main ()
+ {
+@@ -31073,16 +31043,17 @@
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char tgetent ();
+ int
+ main ()
+ {
++#if defined(sun) || defined(__sun) || defined(__sun__)
++#error "we want to use libcurses."
++return 255;
++#else
+ return tgetent ();
+   ;
+   return 0;
++#endif
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -31160,7 +31131,7 @@
  TERMCAP_LIB=
  TERMCAP_DEP=
  else
@@ -310,7 +408,7 @@
  TERMCAP_DEP=
  fi
  
-@@ -30676,7 +30654,7 @@
+@@ -31368,7 +31339,7 @@
  then
  	{ $as_echo "$as_me:$LINENO: checking shared object configuration for loadable builtins" >&5
  $as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
upstream/oracle/userland-gate