Mercurial > jdk8-mips64-public / changeset

changeset

Merge jdk8-b115

Thu, 31 Oct 2013 16:24:33 -0700

author
lana
date
Thu, 31 Oct 2013 16:24:33 -0700
changeset 905
763ada2a1d8c
parent 876
b65d48f6938a
parent 904
37d2736caf46
child 906
40e892e2a4f2
child 907
c1029b02ca87
child 972
f3697e0783e2

Merge

     1.1 --- a/common/autoconf/basics.m4	Thu Oct 31 12:36:04 2013 -0700
     1.2 +++ b/common/autoconf/basics.m4	Thu Oct 31 16:24:33 2013 -0700
     1.3 @@ -514,7 +514,7 @@
     1.4      if test "x$IS_GNU_MAKE" = x; then
     1.5        AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
     1.6      else
     1.7 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'`
     1.8 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[[12]]' -e '4\.'`
     1.9        if test "x$IS_MODERN_MAKE" = x; then
    1.10          AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
    1.11        else

     2.1 --- a/common/autoconf/generated-configure.sh	Thu Oct 31 12:36:04 2013 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Thu Oct 31 16:24:33 2013 -0700
     2.3 @@ -3865,7 +3865,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=1382702260
     2.8 +DATE_WHEN_GENERATED=1383151988
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -8323,7 +8323,7 @@
    2.13        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    2.14  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    2.15      else
    2.16 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    2.17 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
    2.18        if test "x$IS_MODERN_MAKE" = x; then
    2.19          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
    2.20  $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
    2.21 @@ -8680,7 +8680,7 @@
    2.22        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    2.23  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    2.24      else
    2.25 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    2.26 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
    2.27        if test "x$IS_MODERN_MAKE" = x; then
    2.28          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
    2.29  $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
    2.30 @@ -9034,7 +9034,7 @@
    2.31        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    2.32  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    2.33      else
    2.34 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    2.35 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
    2.36        if test "x$IS_MODERN_MAKE" = x; then
    2.37          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
    2.38  $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
    2.39 @@ -9393,7 +9393,7 @@
    2.40        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    2.41  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    2.42      else
    2.43 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    2.44 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
    2.45        if test "x$IS_MODERN_MAKE" = x; then
    2.46          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
    2.47  $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}
    2.48 @@ -9746,7 +9746,7 @@
    2.49        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    2.50  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    2.51      else
    2.52 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    2.53 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[12]' -e '4\.'`
    2.54        if test "x$IS_MODERN_MAKE" = x; then
    2.55          { $as_echo "$as_me:${as_lineno-$LINENO}: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&5
    2.56  $as_echo "$as_me: Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring." >&6;}

Mercurial Repository: jdk8-mips64-public

mercurial