Mercurial > hg > openjdk > aarch64-port
changeset 1462:ad29ab85d1d7
Merge
| author | lana |
|---|---|
| date | Thu, 07 May 2015 21:05:43 -0700 |
| parents | 7ed130e10665 (current diff) ff2690c06dd8 (diff) |
| children | 08a417ec9b3e |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/basics_windows.m4 Wed May 06 13:12:01 2015 -0700 +++ b/common/autoconf/basics_windows.m4 Thu May 07 21:05:43 2015 -0700 @@ -312,8 +312,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` + if test "x$CYGWIN_VERSION_OLD" != x; then AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) AC_MSG_ERROR([Cannot continue]) fi
--- a/common/autoconf/generated-configure.sh Wed May 06 13:12:01 2015 -0700 +++ b/common/autoconf/generated-configure.sh Thu May 07 21:05:43 2015 -0700 @@ -3878,7 +3878,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1426765548 +DATE_WHEN_GENERATED=1430836833 ############################################################################### # @@ -7265,8 +7265,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'` + if test "x$CYGWIN_VERSION_OLD" != x; then { $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 $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;} as_fn_error $? "Cannot continue" "$LINENO" 5