Mercurial > hg > icedtea7

changeset 2913:c0d45d84fc4a icedtea-2.7.0pre11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9f216f601efb
children 704de0a1b110
files ChangeLog NEWS patches/cacao/memory.patch
diffstat 3 files changed, 26 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 26 23:09:35 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-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-2.7.0pre11.
--- a/NEWS	Wed Apr 26 23:09:35 2017 +0100
+++ b/NEWS	Thu Apr 27 02:37:41 2017 +0100
@@ -35,6 +35,8 @@
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
   - PR3349: Architectures unsupported by SystemTap tapsets throw a parse error
   - 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	Wed Apr 26 23:09:35 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