summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-01-29 21:29:32 +0000
committerjoerg <joerg@pkgsrc.org>2015-01-29 21:29:32 +0000
commit2e42d6650a6b760c0f0401002ad46095e5bffa56 (patch)
treeb424c14ae44e4667bdb8502dea998835fa99badc
parent9872c2af747acf9e665f4b7fde8fe60906bbd9f9 (diff)
downloadpkgsrc-2e42d6650a6b760c0f0401002ad46095e5bffa56.tar.gz
Limit memory used by the Queens test program.
-rw-r--r--lang/openjdk7/distinfo4
-rw-r--r--lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make11
2 files changed, 12 insertions, 3 deletions
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 0db0c2aeb77..1d85eebf2ca 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2015/01/27 12:31:06 ryoon Exp $
+$NetBSD: distinfo,v 1.64 2015/01/29 21:29:32 joerg Exp $
SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -49,7 +49,7 @@ SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = ca95d6cb163c863a8716a3ae88
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_buildtree.make) = aed6cab66a8c55a2214432cb531fe0d5a9239d55
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ba5bbe69d44143105bc74641bc55f3814d55abb0
SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
index eb2c41d9de4..f8c82e24ea0 100644
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
@@ -1,4 +1,4 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.1 2014/01/20 19:25:11 joerg Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.2 2015/01/29 21:29:32 joerg Exp $
--- hotspot/make/bsd/makefiles/buildtree.make.orig 2014-01-06 02:36:18.000000000 +0000
+++ hotspot/make/bsd/makefiles/buildtree.make
@@ -11,3 +11,12 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.1 2014/01/20 19:25:
ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
+@@ -494,7 +494,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADI
+ echo "# Compile Queens program for test"; \
+ echo ""; \
+ echo "rm -f Queens.class"; \
+- echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
++ echo "\$${JAVA_HOME}/bin/javac -J-XX:+UseSerialGC -J-mx1024m -d . $(GAMMADIR)/make/test/Queens.java"; \
+ echo ""; \
+ echo "# Set library path solely for gamma launcher test run"; \
+ echo ""; \