diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/openjdk7/Makefile | 32 | ||||
-rw-r--r-- | lang/openjdk7/distinfo | 15 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-ae | 4 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-am | 15 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk | 4 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make | 23 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-jaxp_make_Makefile | 12 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-jdk_test_Makefile | 4 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-langtools_make_Makefile | 13 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-langtools_make_build.xml | 48 |
10 files changed, 134 insertions, 36 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 05ccccea0de..71f632b0f31 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2014/09/11 13:50:24 joerg Exp $ +# $NetBSD: Makefile,v 1.77 2014/09/13 14:35:25 joerg Exp $ DISTNAME= openjdk-1.7.65-20140719 PKGNAME= openjdk7-1.7.65 @@ -175,25 +175,21 @@ post-extract: ${MKDIR} ${ALT_BOOTDIR}/bin ${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include ${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib - printf '#!/bin/sh\nexec %s/bin/java -mx256m "$$@"\n' \ - ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/java -.else - mv ${ALT_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin/java-real - printf '#!/bin/sh\nexec %s/bin/java-real -mx256m "$$@"\n' \ - ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/java + ${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javah ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/javap ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/idlj ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/jar ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin + ${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin +.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs) + cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/} .endif - chmod a+x ${ALT_BOOTDIR}/bin/java -.for t in idlj jar javac javah javap native2ascii rmic -.if ${OPSYS} == "SunOS" - printf '#!/bin/sh\n\nexec %s/bin/${t} -J-mx256m "$$@"\n' \ - ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t} -.else - mv ${ALT_BOOTDIR}/bin/${t} ${ALT_BOOTDIR}/bin/${t}-real - printf '#!/bin/sh\n\nexec %s/bin/${t}-real -J-mx256m "$$@"\n' \ - ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t} + +.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) +ALL_ENV+= LDFLAGS_LIBGCC=-lgcc_s .endif - chmod a+x ${ALT_BOOTDIR}/bin/${t} -.endfor do-build: ${WRKDIR}/stage3-done diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 2cf2eeaf137..910933fb3c4 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2014/07/25 23:24:13 ryoon Exp $ +$NetBSD: distinfo,v 1.53 2014/09/13 14:35:25 joerg Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -49,13 +49,13 @@ SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 SHA1 (patch-aa) = d47738b934304ee0921fe56b036fc0483faa328b SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 -SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8 +SHA1 (patch-ae) = 843f05cfe8f18d080cae80eed92d9ad89a5c0917 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 -SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 +SHA1 (patch-am) = d3ea039c882a73ff370b2c7bd6be94136b9f2bbb SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476 @@ -69,12 +69,13 @@ SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620 -SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 548718a351fe6159d3de4120cba90701c064ddda +SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 14c5beeb30789360a989d4233dbcddba21b98021 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58 SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf +SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 1b89ef4ac8bd6a1b5cf3f35935976d85b4f9dbb1 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd @@ -103,6 +104,7 @@ SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f258 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e +SHA1 (patch-jaxp_make_Makefile) = 42a7e1816c72ab1be206e1056f362407c10b5f7c SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 @@ -149,11 +151,12 @@ SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 -SHA1 (patch-jdk_test_Makefile) = 62618854251a5fe139310fc443af3f2f0103f63c +SHA1 (patch-jdk_test_Makefile) = 2fb1a5bf1e33cc2d984bfd73af78bf66b31b5acb SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295 SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32 -SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09 +SHA1 (patch-langtools_make_Makefile) = 450febe135718d5e48365598de9d102cb04379c4 +SHA1 (patch-langtools_make_build.xml) = 7ebfdf37f60e8e45f35fbcf1b4d8687a0014e581 diff --git a/lang/openjdk7/patches/patch-ae b/lang/openjdk7/patches/patch-ae index 9279333af06..cbe42ab3ab4 100644 --- a/lang/openjdk7/patches/patch-ae +++ b/lang/openjdk7/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.5 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ae,v 1.6 2014/09/13 14:35:25 joerg Exp $ Additional BSD support. @@ -11,7 +11,7 @@ Additional BSD support. + +ifeq ($(OS_VENDOR), NetBSD) +# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD. -+LFLAGS += -lgcc_s ++LFLAGS += ${LDFLAGS_LIBGCC} +endif + +# XXX tnn fixme: this probably should go someplace else. diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am index a8626b667f3..dbf9f00b99e 100644 --- a/lang/openjdk7/patches/patch-am +++ b/lang/openjdk7/patches/patch-am @@ -1,10 +1,10 @@ -$NetBSD: patch-am,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-am,v 1.5 2014/09/13 14:35:25 joerg Exp $ Set username to pkgsrc. ---- jdk/make/common/shared/Defs.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +--- jdk/make/common/shared/Defs.gmk.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/common/shared/Defs.gmk -@@ -303,7 +303,7 @@ else +@@ -301,7 +301,7 @@ ifndef BUILD_NUMBER BUILD_NUMBER = b00 ifndef USER_RELEASE_SUFFIX BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') @@ -13,3 +13,12 @@ Set username to pkgsrc. USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) endif export USER_RELEASE_SUFFIX +@@ -615,7 +615,7 @@ endif + # To workaround this we will specify JAVA_HOME explicitly + + ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp +-ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' JAVA_HOME='$(BOOTDIR)' ++ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -mx1024m JAVA_HOME='$(BOOTDIR)' + + ifeq ($(ANT_HOME),) + ANT = $(ANT_WORKAROUNDS) ant diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk index 2340d445dd0..21d482cdc75 100644 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk +++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk @@ -1,4 +1,4 @@ -$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 joerg Exp $ +$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.2 2014/09/13 14:35:25 joerg Exp $ --- corba/make/common/shared/Defs-java.gmk.orig 2014-01-05 23:11:01.000000000 +0000 +++ corba/make/common/shared/Defs-java.gmk @@ -7,7 +7,7 @@ $NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 # and creating the hotspot.log file. JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \ - -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -+ -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms256m -XX:+UseSerialGC ++ -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms512m -XX:+UseSerialGC # JVM options JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS) diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make new file mode 100644 index 00000000000..f59d2b3fda8 --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make @@ -0,0 +1,23 @@ +$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2014/09/13 14:35:25 joerg Exp $ + +--- hotspot/make/bsd/makefiles/rules.make.orig 2014-09-12 17:24:02.000000000 +0000 ++++ hotspot/make/bsd/makefiles/rules.make +@@ -68,12 +68,12 @@ REMOVE_TARGET = rm -f $@ + + ifdef ALT_BOOTDIR + +-RUN.JAVA = $(ALT_BOOTDIR)/bin/java +-RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap +-RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah +-RUN.JAR = $(ALT_BOOTDIR)/bin/jar ++RUN.JAVA = $(ALT_BOOTDIR)/bin/java -XX:+UseSerialGC -mx1024m ++RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap -J-XX:+UseSerialGC -J-mx1024m ++RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah -J-XX:+UseSerialGC -J-mx1024m ++RUN.JAR = $(ALT_BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m +-COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac +-COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic ++COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac -J-XX:+UseSerialGC -J-mx1024m ++COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic -J-XX:+UseSerialGC -J-mx1024m + BOOT_JAVA_HOME = $(ALT_BOOTDIR) + + else diff --git a/lang/openjdk7/patches/patch-jaxp_make_Makefile b/lang/openjdk7/patches/patch-jaxp_make_Makefile new file mode 100644 index 00000000000..75bc30d8e97 --- /dev/null +++ b/lang/openjdk7/patches/patch-jaxp_make_Makefile @@ -0,0 +1,12 @@ +$NetBSD: patch-jaxp_make_Makefile,v 1.1 2014/09/13 14:35:25 joerg Exp $ + +--- jaxp/make/Makefile.orig 2014-09-12 20:54:09.000000000 +0000 ++++ jaxp/make/Makefile +@@ -33,6 +33,7 @@ + # + SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33 + ++ANT_OPTS += -XX:+UseSerialGC -mx1024m + ifdef QUIET + ANT_OPTIONS += -quiet + endif diff --git a/lang/openjdk7/patches/patch-jdk_test_Makefile b/lang/openjdk7/patches/patch-jdk_test_Makefile index f9e00a26422..b277e4e4264 100644 --- a/lang/openjdk7/patches/patch-jdk_test_Makefile +++ b/lang/openjdk7/patches/patch-jdk_test_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-jdk_test_Makefile,v 1.2 2014/01/20 19:25:11 joerg Exp $ +$NetBSD: patch-jdk_test_Makefile,v 1.3 2014/09/13 14:35:25 joerg Exp $ Use tools from pkgsrc. @@ -40,7 +40,7 @@ Use tools from pkgsrc. # The jtjck.jar utility to use to run the tests JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar -JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m -+JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx512m -XX:+UseSerialGC ++JTJCK_JAVA_ARGS = -XX:MaxPermSize=256m -Xmx1024m -XX:+UseSerialGC JTJCK_OPTIONS = -headless -v # Default tests to run diff --git a/lang/openjdk7/patches/patch-langtools_make_Makefile b/lang/openjdk7/patches/patch-langtools_make_Makefile new file mode 100644 index 00000000000..cfc9ece6a9f --- /dev/null +++ b/lang/openjdk7/patches/patch-langtools_make_Makefile @@ -0,0 +1,13 @@ +$NetBSD: patch-langtools_make_Makefile,v 1.1 2014/09/13 14:35:25 joerg Exp $ + +--- langtools/make/Makefile.orig 2014-09-12 13:06:23.000000000 +0000 ++++ langtools/make/Makefile +@@ -162,7 +162,7 @@ endif + ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR)) + + ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp +-ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' ++ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR) -XX:+UseSerialGC -mx1024m' + + ifdef FINDBUGS_HOME + ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME) diff --git a/lang/openjdk7/patches/patch-langtools_make_build.xml b/lang/openjdk7/patches/patch-langtools_make_build.xml index 3ed56313113..769faf3cde1 100644 --- a/lang/openjdk7/patches/patch-langtools_make_build.xml +++ b/lang/openjdk7/patches/patch-langtools_make_build.xml @@ -1,8 +1,8 @@ -$NetBSD: patch-langtools_make_build.xml,v 1.1 2013/06/02 06:12:28 ryoon Exp $ +$NetBSD: patch-langtools_make_build.xml,v 1.2 2014/09/13 14:35:25 joerg Exp $ * Avoid *.orig files. ---- langtools/make/build.xml.orig 2012-08-10 17:39:19.000000000 +0000 +--- langtools/make/build.xml.orig 2014-01-01 05:54:07.000000000 +0000 +++ langtools/make/build.xml @@ -235,7 +235,8 @@ </chmod> @@ -14,7 +14,28 @@ $NetBSD: patch-langtools_make_build.xml,v 1.1 2013/06/02 06:12:28 ryoon Exp $ </target> <target name="build-bootstrap-tools" -@@ -804,6 +805,7 @@ +@@ -336,7 +337,10 @@ + classpath="${dist.lib.dir}/javac.jar" + includeAntRuntime="no" + debug="${javac.debug}" +- debuglevel="${javac.debuglevel}"/> ++ debuglevel="${javac.debuglevel}"> ++ <compilerarg value="-J-XX:+UseSerialGC"/> ++ <compilerarg value="-J-mx1024m"/> ++ </javac> + <java fork="true" + jvm="${target.java.home}/bin/java" + dir="test/tools/javac/diags" +@@ -795,6 +799,8 @@ + debuglevel="${javac.debuglevel}"> + <compilerarg value="-implicit:none"/> + <compilerarg value="-Xprefer:source"/> ++ <compilerarg value="-J-XX:+UseSerialGC"/> ++ <compilerarg value="-J-mx1024m"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg line="@{bootclasspath.opt}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> +@@ -804,6 +810,7 @@ <copy todir="@{classes.dir}" includeemptydirs="false"> <fileset dir="${src.classes.dir}" includes="@{includes}" excludes="@{excludes}"> <exclude name="**/*.java"/> @@ -22,3 +43,24 @@ $NetBSD: patch-langtools_make_build.xml,v 1.1 2013/06/02 06:12:28 ryoon Exp $ <exclude name="**/*.properties"/> <exclude name="**/*-template"/> <exclude name="**/*.rej"/> +@@ -857,7 +864,10 @@ + srcdir="${make.tools.dir}/CompileProperties" + destdir="${build.toolclasses.dir}/" + classpath="${ant.core.lib}" +- includeantruntime="false"/> ++ includeantruntime="false"> ++ <compilerarg value="-J-XX:+UseSerialGC"/> ++ <compilerarg value="-J-mx1024m"/> ++ </javac> + <taskdef name="pcompile" + classname="CompilePropertiesTask" + classpath="${build.toolclasses.dir}/"/> +@@ -874,6 +884,8 @@ + classpath="${ant.core.lib}" + includeantruntime="false"> + <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> ++ <compilerarg value="-J-XX:+UseSerialGC"/> ++ <compilerarg value="-J-mx1024m"/> + </javac> + <taskdef name="genstubs" + classname="GenStubs$$Ant" |