diff options
| -rw-r--r-- | .hgtags | 13 | ||||
| -rw-r--r-- | THIRD_PARTY_README | 4 | ||||
| -rw-r--r-- | common/autoconf/jdk-options.m4 | 6 |
3 files changed, 21 insertions, 2 deletions
@@ -260,4 +260,17 @@ cc868070f1959b849c8c3b867771fbdb07b9ba05 jdk8u20-b02 839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130 0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131 2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132 +c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01 +6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02 +794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03 +c200d6cb184056e44afe7102913004b717896aa3 jdk8u5-b04 +eb537d7c31e069ac10de0901727515743f7535d2 jdk8u5-b05 +75cdae18810a479cc3c0fe8eb9055d968ae31c63 jdk8u5-b06 +b1585984f29320737ca0da5af029b1225a75c476 jdk8u5-b07 +a445d4130af79027fd9d6675b1ad7a8990225749 jdk8u5-b08 +e5403ff707fbd828e56bf390931f236028f9617b jdk8u5-b09 +fae51c73a06d71304c9dbff22984ee501812b972 jdk8u5-b10 +dd3bd272ceedbd69fabafc531b6b1e056659f733 jdk8u5-b11 +3e05b6ae0a1e2bd7352462e9bf8e7262246fb77f jdk8u5-b12 +d81e301cae70f1f95f4bb976ec053c915dee503a jdk8u5-b13 ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06 diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index a93b35b..ce01810 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1399,13 +1399,13 @@ THE SOFTWARE. ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.4, which may be +%% This notice is provided with respect to Little CMS 2.5, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2010 Marti Maria Saguer +Copyright (c) 1998-2011 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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], |