Mercurial > hg > release > icedtea6-1.11
changeset 2846:904945674c52
Merge
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 12 Oct 2012 03:10:34 +0100 |
| parents | f975a9b1d5b5 (current diff) b2abbe3ce55b (diff) |
| children | 12172d5875a5 |
| files | ChangeLog NEWS |
| diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 11 21:48:44 2012 +0100 +++ b/ChangeLog Fri Oct 12 03:10:34 2012 +0100 @@ -32,6 +32,16 @@ * patches/security/20121016/7198606.patch: New patches. +2012-03-19 Andrew John Hughes <ahughes@redhat.com> + + PR 1194: + * acinclude.m4: + (IT_CHECK_FOR_JDK): Update JDK home directory + check list, adding some missing 1.6 entries + and removing generic ones which may now pick + up an unwanted 1.7 installation. + * NEWS: Updated. + 2012-09-05 Matthias Klose <doko@ubuntu.com> * configure.ac: Remove the Xp header and library checks.
--- a/NEWS Thu Oct 11 21:48:44 2012 +0100 +++ b/NEWS Fri Oct 12 03:10:34 2012 +0100 @@ -34,6 +34,8 @@ - S7158804: Improve config file parsing - S7176337: Additional changes needed for 7158801 fix - S7198606, CVE-2012-4416: Improve VM optimization +* Bug fixes + - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default New in release 1.11.4 (2012-08-31):
--- a/acinclude.m4 Thu Oct 11 21:48:44 2012 +0100 +++ b/acinclude.m4 Fri Oct 12 03:10:34 2012 +0100 @@ -1147,9 +1147,9 @@ if test "x${enable_bootstrap}" = "xyes"; then BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao"; fi - for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \ + for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-1.6.0 \ /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do + /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/icedtea-6 ; do if test -d $dir; then SYSTEM_JDK_DIR=$dir break