diff options
| author | asaha <none@none> | 2014-03-28 14:12:36 -0700 |
|---|---|---|
| committer | asaha <none@none> | 2014-03-28 14:12:36 -0700 |
| commit | 1c4ab34946c80688958d9dc8b08ae05bfac2fc8d (patch) | |
| tree | f27afd7718fe601ed18df838391ed31459ea25bf /common | |
| parent | 0818c7c95384d5c7cbedb4904abc819563a79b35 (diff) | |
| download | jdk8u-1c4ab34946c80688958d9dc8b08ae05bfac2fc8d.tar.gz | |
8038655: Resolve autoconf merge issue of 8u5 and 8u20
Reviewed-by: katleman
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/generated-configure.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index f3df11b..e24c4ba 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -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=1394787296 +DATE_WHEN_GENERATED=1396039024 ############################################################################### # @@ -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 |