infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-26 07:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2014-01-09 12:35:20 +01:00
parent 343c8d34a8
commit 2e13e9981d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/autoconf/generated-configure.sh
View File

@ -3865,7 +3865,7 @@ fi
#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 @@ fi
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

6
common/autoconf/jdk-options.m4
View File

@ -423,6 +423,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
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],