Mercurial > hg > release > icedtea6-1.13
changeset 3219:53216154a725
PR829: Raise javadoc and JAVAC_FLAGS memory limits for CACAO
2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Add James.
* NEWS: Updated.
2015-05-23 James Le Cuirot <chewi@gentoo.org>
PR829: Raise javadoc and JAVAC_FLAGS memory
limits for CACAO
* patches/cacao/launcher.patch:
Increase memory limits so a build with CACAO
and doc generation succeeds.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 22 Jul 2015 18:10:19 +0100 |
| parents | ead3ddec2474 |
| children | 7ced00c8ada2 |
| files | AUTHORS ChangeLog NEWS patches/cacao/launcher.patch |
| diffstat | 4 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Wed Jul 22 18:02:41 2015 +0100 +++ b/AUTHORS Wed Jul 22 18:10:19 2015 +0100 @@ -9,6 +9,7 @@ Deepak Bhole <dbhole@redhat.com> Tom Callaway <tcallawa@redhat.com> Pablo del Campo <pablogdc@gmail.com> +James Le Cuirot <chewi@gentoo.org> Danesh Dadachanji <ddadacha@redhat.com> Thomas Fitzsimmons <fitzsim@redhat.com> Matthew Flaschen <matthew.flaschen@gatech.edu>
--- a/ChangeLog Wed Jul 22 18:02:41 2015 +0100 +++ b/ChangeLog Wed Jul 22 18:10:19 2015 +0100 @@ -1,3 +1,16 @@ +2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * AUTHORS: Add James. + * NEWS: Updated. + +2015-05-23 James Le Cuirot <chewi@gentoo.org> + + PR829: Raise javadoc and JAVAC_FLAGS memory + limits for CACAO + * patches/cacao/launcher.patch: + Increase memory limits so a build with CACAO + and doc generation succeeds. + 2015-07-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2556, G390663: Update Gentoo font configuration
--- a/NEWS Wed Jul 22 18:02:41 2015 +0100 +++ b/NEWS Wed Jul 22 18:10:19 2015 +0100 @@ -56,6 +56,8 @@ - PR2486: JSSE server is still limited to 768-bit DHE - PR2508, G541462: Only apply PaX markings by default on running PaX kernels - PR2556, G390663: Update Gentoo font configuration and allow font directory to be specified +* CACAO + - PR829: Raise javadoc and JAVAC_FLAGS memory limits for CACAO * JamVM - PR2522: Add executable stack markings to callNative.S on JamVM
--- a/patches/cacao/launcher.patch Wed Jul 22 18:02:41 2015 +0100 +++ b/patches/cacao/launcher.patch Wed Jul 22 18:10:19 2015 +0100 @@ -1,11 +1,14 @@ --- openjdk/jdk/make/docs/Makefile.orig 2010-06-21 21:15:08.000000000 +0000 +++ openjdk/jdk/make/docs/Makefile 2010-06-23 18:35:55.529822335 +0000 -@@ -70,7 +70,7 @@ +@@ -68,9 +68,9 @@ + # NOTE: javadoc will not complete without these larger settings. + # WARNING: This could cause thrashing on low memory machines. ifeq ($(ARCH_DATA_MODEL),64) - MAX_VM_MEMORY = 1024 +- MAX_VM_MEMORY = 1024 ++ MAX_VM_MEMORY = 1792 else - MAX_VM_MEMORY = 512 -+ MAX_VM_MEMORY = 768 ++ MAX_VM_MEMORY = 1280 endif # List of all possible directories for javadoc to look for sources