Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/NewMakefile.gmk	Mon Oct 21 10:40:16 2013 +0200
     1.2 +++ b/NewMakefile.gmk	Mon Oct 21 11:59:25 2013 +0200
     1.3 @@ -36,10 +36,8 @@
     1.4  TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
     1.5  
     1.6  # Assume we have GNU make, but check version.
     1.7 -ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
     1.8 -  ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
     1.9 -    $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    1.10 -  endif
    1.11 +ifeq ($(strip $(foreach v, 3.81 3.82 4.%, $(filter $v, $(MAKE_VERSION)))), )
    1.12 +  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    1.13  endif
    1.14  
    1.15  # Locate this Makefile

     2.1 --- a/common/autoconf/basics.m4	Mon Oct 21 10:40:16 2013 +0200
     2.2 +++ b/common/autoconf/basics.m4	Mon Oct 21 11:59:25 2013 +0200
     2.3 @@ -502,7 +502,7 @@
     2.4      if test "x$IS_GNU_MAKE" = x; then
     2.5        AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
     2.6      else
     2.7 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'`
     2.8 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'`
     2.9        if test "x$IS_MODERN_MAKE" = x; then
    2.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.])
    2.11        else

     3.1 --- a/common/autoconf/generated-configure.sh	Mon Oct 21 10:40:16 2013 +0200
     3.2 +++ b/common/autoconf/generated-configure.sh	Mon Oct 21 11:59:25 2013 +0200
     3.3 @@ -3822,7 +3822,7 @@
     3.4  #CUSTOM_AUTOCONF_INCLUDE
     3.5  
     3.6  # Do not change or remove the following line, it is needed for consistency checks:
     3.7 -DATE_WHEN_GENERATED=1382084973
     3.8 +DATE_WHEN_GENERATED=1382349488
     3.9  
    3.10  ###############################################################################
    3.11  #
    3.12 @@ -8273,7 +8273,7 @@
    3.13        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    3.14  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    3.15      else
    3.16 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
    3.17 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    3.18        if test "x$IS_MODERN_MAKE" = x; then
    3.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
    3.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;}
    3.21 @@ -8630,7 +8630,7 @@
    3.22        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    3.23  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    3.24      else
    3.25 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
    3.26 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    3.27        if test "x$IS_MODERN_MAKE" = x; then
    3.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
    3.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;}
    3.30 @@ -8984,7 +8984,7 @@
    3.31        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    3.32  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    3.33      else
    3.34 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
    3.35 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    3.36        if test "x$IS_MODERN_MAKE" = x; then
    3.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
    3.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;}
    3.39 @@ -9343,7 +9343,7 @@
    3.40        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    3.41  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    3.42      else
    3.43 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
    3.44 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    3.45        if test "x$IS_MODERN_MAKE" = x; then
    3.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
    3.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;}
    3.48 @@ -9696,7 +9696,7 @@
    3.49        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&5
    3.50  $as_echo "$as_me: Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring." >&6;}
    3.51      else
    3.52 -      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[12346789]'`
    3.53 +      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[12]\)\|\(4\.\)'`
    3.54        if test "x$IS_MODERN_MAKE" = x; then
    3.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
    3.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;}