diff options
| author | asaha <none@none> | 2014-03-28 13:23:06 -0700 |
|---|---|---|
| committer | asaha <none@none> | 2014-03-28 13:23:06 -0700 |
| commit | 0818c7c95384d5c7cbedb4904abc819563a79b35 (patch) | |
| tree | 5e963a87da5ad3b55f296cd591b203171e142565 /common | |
| parent | cb5e907152310467f06929e39ff3a2540a0ce582 (diff) | |
| parent | 7c25cec438b4e846f4189cf40c8349c8116642a0 (diff) | |
| download | jdk8u-0818c7c95384d5c7cbedb4904abc819563a79b35.tar.gz | |
Merge
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/jdk-options.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 4397fb8..58e338a 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -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], |