Mercurial > hg > icedtea6-hg
changeset 3155:7e07169a1831
Disable annotation race condition backport temporarily as causes crashes during bootstrap.
2014-10-08 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Disable annotation race
condition backport temporarily as causes
crashes during bootstrap.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 08 Oct 2014 23:10:14 +0100 |
| parents | 251d55dd9268 |
| children | c125344ef224 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 02 22:50:54 2014 +0100 +++ b/ChangeLog Wed Oct 08 23:10:14 2014 +0100 @@ -1,3 +1,10 @@ +2014-10-08 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Disable annotation race + condition backport temporarily as causes + crashes during bootstrap. + 2014-10-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Thu Oct 02 22:50:54 2014 +0100 +++ b/Makefile.am Wed Oct 08 23:10:14 2014 +0100 @@ -617,8 +617,10 @@ patches/openjdk/6611637-npe_in_glyphlayout.patch \ patches/openjdk/6727719-performance_of_textlayout_getbounds.patch \ patches/openjdk/6745225-memory_leak_in_attributed_string.patch \ - patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch \ - patches/openjdk/7122142-annotation_race_condition.patch + patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch + +# Temporarily disabled as causes crashes +# patches/openjdk/7122142-annotation_race_condition.patch if WITH_RHINO ICEDTEA_PATCHES += \