OpenJDK / amber / amber
changeset 22176:3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
Reviewed-by: tbell, ihse
| author | erikj |
|---|---|
| date | Thu, 09 Jan 2014 12:35:20 +0100 |
| parents | f130ca87de66 |
| children | c1a48c7b5b2b |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Jul 05 19:26:54 2017 +0200 +++ b/common/autoconf/generated-configure.sh Thu Jan 09 12:35:20 2014 +0100 @@ -3865,7 +3865,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1389186094 +DATE_WHEN_GENERATED=1389267188 ############################################################################### # @@ -11156,6 +11156,12 @@ as_fn_error $? "Update version must have a value" "$LINENO" 5 elif test "x$with_update_version" != x; then JDK_UPDATE_VERSION="$with_update_version" + # On macosx 10.7, it's not possible to set --with-update-version=0X due + # to a bug in expr (which reduces it to just X). To work around this, we + # always add a 0 to one digit update versions. + if test "${#JDK_UPDATE_VERSION}" = "1"; then + JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" + fi fi
--- a/common/autoconf/jdk-options.m4 Wed Jul 05 19:26:54 2017 +0200 +++ b/common/autoconf/jdk-options.m4 Thu Jan 09 12:35:20 2014 +0100 @@ -423,6 +423,12 @@ AC_MSG_ERROR([Update version must have a value]) elif test "x$with_update_version" != x; then JDK_UPDATE_VERSION="$with_update_version" + # On macosx 10.7, it's not possible to set --with-update-version=0X due + # to a bug in expr (which reduces it to just X). To work around this, we + # always add a 0 to one digit update versions. + if test "${#JDK_UPDATE_VERSION}" = "1"; then + JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" + fi fi AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],