Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Sun Dec 08 20:13:39 2013 -0800
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Dec 16 13:56:08 2013 +0100
     1.3 @@ -3865,7 +3865,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1384422786
     1.8 +DATE_WHEN_GENERATED=1387198493
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -11156,6 +11156,12 @@
    1.13      as_fn_error $? "Update version must have a value" "$LINENO" 5
    1.14    elif test "x$with_update_version" != x; then
    1.15      JDK_UPDATE_VERSION="$with_update_version"
    1.16 +    # On macosx 10.7, it's not possible to set --with-update-version=0X due
    1.17 +    # to a bug in expr (which reduces it to just X). To work around this, we
    1.18 +    # always add a 0 to one digit update versions.
    1.19 +    if test "${#JDK_UPDATE_VERSION}" = "1"; then
    1.20 +      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
    1.21 +    fi
    1.22    fi
    1.23  
    1.24  

     2.1 --- a/common/autoconf/jdk-options.m4	Sun Dec 08 20:13:39 2013 -0800
     2.2 +++ b/common/autoconf/jdk-options.m4	Mon Dec 16 13:56:08 2013 +0100
     2.3 @@ -423,6 +423,12 @@
     2.4      AC_MSG_ERROR([Update version must have a value])
     2.5    elif test "x$with_update_version" != x; then
     2.6      JDK_UPDATE_VERSION="$with_update_version"
     2.7 +    # On macosx 10.7, it's not possible to set --with-update-version=0X due
     2.8 +    # to a bug in expr (which reduces it to just X). To work around this, we
     2.9 +    # always add a 0 to one digit update versions.
    2.10 +    if test "${#JDK_UPDATE_VERSION}" = "1"; then
    2.11 +      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
    2.12 +    fi
    2.13    fi
    2.14  
    2.15    AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],