Mercurial > hg > release > icedtea7-2.6
changeset 2923:ca047d031821
PR2732: Raise javadoc memory limits for CACAO again!
2017-04-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2732: Raise javadoc memory limits for CACAO
again!
* NEWS: Updated.
2015-11-30 James Le Cuirot <chewi@gentoo.org>
PR2732: Raise javadoc memory limits for CACAO
again!
* patches/cacao/memory.patch: Increase memory
limits so a build with CACAO and doc generation
succeeds.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Thu, 27 Apr 2017 02:37:41 +0100 |
parents | 7e6805119470 |
children | dcf74eeb8cd8 |
files | ChangeLog NEWS patches/cacao/memory.patch |
diffstat | 3 files changed, 26 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 28 17:10:43 2017 +0100 +++ b/ChangeLog Thu Apr 27 02:37:41 2017 +0100 @@ -1,3 +1,17 @@ +2017-04-26 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2732: Raise javadoc memory limits for CACAO + again! + * NEWS: Updated. + +2015-11-30 James Le Cuirot <chewi@gentoo.org> + + PR2732: Raise javadoc memory limits for CACAO + again! + * patches/cacao/memory.patch: Increase memory + limits so a build with CACAO and doc generation + succeeds. + 2017-04-27 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am,
--- a/NEWS Fri Apr 28 17:10:43 2017 +0100 +++ b/NEWS Thu Apr 27 02:37:41 2017 +0100 @@ -27,6 +27,8 @@ - S8174729, PR3361: Race Condition in java.lang.reflect.WeakCache * Bug fixes - PR3370: Disable ARM32 JIT by default in jdk_generic_profile.sh +* CACAO + - PR2732: Raise javadoc memory limits for CACAO again! * AArch64 port - S8177661, PR3367: Correct ad rule output register types from iRegX to iRegXNoSp
--- a/patches/cacao/memory.patch Fri Apr 28 17:10:43 2017 +0100 +++ b/patches/cacao/memory.patch Thu Apr 27 02:37:41 2017 +0100 @@ -47,23 +47,23 @@ else MB_OF_MEMORY := unknown diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100 -+++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100 -@@ -69,11 +69,11 @@ +--- openjdk.orig/jdk/make/docs/Makefile 2015-11-30 05:07:07.728000000 -0800 ++++ openjdk/jdk/make/docs/Makefile 2015-11-30 05:07:47.064000000 -0800 +@@ -68,13 +68,7 @@ + # We override whatever the max VM memory setting is here. # NOTE: javadoc will not complete without these larger settings. # WARNING: This could cause thrashing on low memory machines. - ifeq ($(ARCH_DATA_MODEL),64) +-ifeq ($(ARCH_DATA_MODEL),64) - MAX_VM_MEMORY = 1536 -+ MAX_VM_MEMORY = 1792 - else ifeq ($(ARCH),universal) +-else ifeq ($(ARCH),universal) - MAX_VM_MEMORY = 1536 -+ MAX_VM_MEMORY = 1792 - else +-else - MAX_VM_MEMORY = 768 -+ MAX_VM_MEMORY = 2048 - endif +-endif ++MAX_VM_MEMORY = 2048 # List of all possible directories for javadoc to look for sources + # NOTE: Quotes are required around sourcepath argument only on Windows. diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml --- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100 +++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100