Mercurial > hg > release > icedtea6-1.12
changeset 2947:5a1e1b396644 icedtea6-1.12-branchpoint
PR986: IcedTea7 fails to build with IcedTea6 CACAO due to low max heap size
2013-01-28 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/cacao/memory.patch:
Extend with additional cases in HotSpot and
JAXWS.
2012-06-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR986
* Makefile.am:
(ICEDTEA_PATCHES): Add memory patch when
building using CACAO as well, even if the
result is not a CACAO build.
* acinclude.m4:
(IT_USING_CACAO): New macro; detects use of
CACAO as the build VM so memory limits can
be raised accordingly.
* configure.ac: Call IT_USING_CACAO.
* NEWS: Updated.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 29 Jan 2013 01:21:09 +0000 |
parents | f6a0a42bf443 |
children | 69b6ee297123 |
files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac patches/cacao/memory.patch |
diffstat | 6 files changed, 90 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 25 21:33:29 2013 +0000 +++ b/ChangeLog Tue Jan 29 01:21:09 2013 +0000 @@ -1,3 +1,23 @@ +2013-01-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * patches/cacao/memory.patch: + Extend with additional cases in HotSpot and + JAXWS. + +2012-06-12 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR986 + * Makefile.am: + (ICEDTEA_PATCHES): Add memory patch when + building using CACAO as well, even if the + result is not a CACAO build. + * acinclude.m4: + (IT_USING_CACAO): New macro; detects use of + CACAO as the build VM so memory limits can + be raised accordingly. + * configure.ac: Call IT_USING_CACAO. + * NEWS: Updated. + 2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * pax-mark-vm.in: Add template for pax mark
--- a/Makefile.am Fri Jan 25 21:33:29 2013 +0000 +++ b/Makefile.am Tue Jan 29 01:21:09 2013 +0000 @@ -482,6 +482,11 @@ patches/cacao/launcher.patch \ patches/cacao/memory.patch \ patches/cacao/armhf.patch +else +if USING_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/memory.patch +endif endif if ENABLE_PULSE_JAVA
--- a/NEWS Fri Jan 25 21:33:29 2013 +0000 +++ b/NEWS Tue Jan 29 01:21:09 2013 +0000 @@ -58,6 +58,7 @@ - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible - RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive - G422525: Apply pax markings before using a freshly built JVM. + - PR986: IcedTea7 fails to build with IcedTea6 CACAO due to low max heap size * CACAO - PR1120: Unified version for icedtea6/7 - CA166, CA167: check-langtools fixes for icedtea6
--- a/acinclude.m4 Fri Jan 25 21:33:29 2013 +0000 +++ b/acinclude.m4 Tue Jan 29 01:21:09 2013 +0000 @@ -2028,3 +2028,18 @@ AC_SUBST(PAX_COMMAND) AC_SUBST(PAX_COMMAND_ARGS) ]) + +AC_DEFUN([IT_USING_CACAO],[ + AC_REQUIRE([IT_FIND_JAVA]) + AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [ + if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then + it_cv_cacao=yes; + else + it_cv_cacao=no; + fi + ]) + USING_CACAO=$it_cv_cacao + AC_SUBST(USING_CACAO) + AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes") + AC_PROVIDE([$0])dnl +])
--- a/configure.ac Fri Jan 25 21:33:29 2013 +0000 +++ b/configure.ac Tue Jan 29 01:21:09 2013 +0000 @@ -214,6 +214,7 @@ IT_FIND_ECJ_JAR IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi +IT_USING_CACAO AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap])
--- a/patches/cacao/memory.patch Fri Jan 25 21:33:29 2013 +0000 +++ b/patches/cacao/memory.patch Tue Jan 29 01:21:09 2013 +0000 @@ -16,3 +16,51 @@ <compilerarg line="${javac.no.jdk.warnings}"/> <compilerarg line="${javac.version.opt}"/> <compilerarg line="${javac.lint.opts}"/> +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk-ecj/hotspot/make/linux/makefiles/rules.make +--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2013-01-26 13:32:42.117831617 +0000 ++++ openjdk/hotspot/make/linux/makefiles/rules.make 2013-01-26 13:33:29.934595340 +0000 +@@ -133,7 +133,7 @@ + # Settings for javac + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 +-JAVAC_FLAGS = -g -encoding ascii ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m + BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) + + # With parallel makes, print a message at the end of compilation. +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk-ecj/hotspot/make/solaris/makefiles/rules.make +--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2013-01-26 13:32:42.137831936 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2013-01-26 13:33:41.934787007 +0000 +@@ -133,7 +133,7 @@ + # Settings for javac + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 +-JAVAC_FLAGS = -g -encoding ascii ++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m + BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) + + # With parallel makes, print a message at the end of compilation. +diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk-ecj/hotspot/make/windows/makefiles/rules.make +--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2013-01-26 13:32:42.153832191 +0000 ++++ openjdk/hotspot/make/windows/makefiles/rules.make 2013-01-26 13:34:12.419273915 +0000 +@@ -45,7 +45,7 @@ + # Settings for javac + BOOT_SOURCE_LANGUAGE_VERSION=5 + BOOT_TARGET_CLASS_VERSION=5 +-JAVAC_FLAGS=-g -encoding ascii ++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m + BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) + + ProjectFile=jvm.vcproj +diff -Nru openjdk.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties +--- openjdk.orig/jaxws/build.properties 2013-01-26 06:52:34.544450267 +0000 ++++ openjdk/jaxws/build.properties 2013-01-26 06:52:51.896729971 +0000 +@@ -51,7 +51,7 @@ + + # JVM memory size + javac.memoryInitialSize = 256m +-javac.memoryMaximumSize = 512m ++javac.memoryMaximumSize = 768m + + #------------------------------------------------------------ +