Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/basics_windows.m4	Wed May 13 12:50:05 2015 -0700
     1.2 +++ b/common/autoconf/basics_windows.m4	Thu May 14 20:11:10 2015 -0700
     1.3 @@ -312,8 +312,8 @@
     1.4      WINDOWS_ENV_VENDOR='cygwin'
     1.5      WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
     1.6  
     1.7 -    CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.`
     1.8 -    if test "x$CYGWIN_VERSION_OK" = x; then
     1.9 +    CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'`
    1.10 +    if test "x$CYGWIN_VERSION_OLD" != x; then
    1.11        AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.])
    1.12        AC_MSG_ERROR([Cannot continue])
    1.13      fi

     2.1 --- a/common/autoconf/generated-configure.sh	Wed May 13 12:50:05 2015 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Thu May 14 20:11:10 2015 -0700
     2.3 @@ -3878,7 +3878,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1426765548
     2.8 +DATE_WHEN_GENERATED=1430836833
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -7265,8 +7265,8 @@
    2.13      WINDOWS_ENV_VENDOR='cygwin'
    2.14      WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
    2.15  
    2.16 -    CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.`
    2.17 -    if test "x$CYGWIN_VERSION_OK" = x; then
    2.18 +    CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'`
    2.19 +    if test "x$CYGWIN_VERSION_OLD" != x; then
    2.20        { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5
    2.21  $as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;}
    2.22        as_fn_error $? "Cannot continue" "$LINENO" 5