Mon Sep 22 11:54:45 2014 UTC ()
Force serial GC for jar invocations.


(joerg)
diff -r1.53 -r1.54 pkgsrc/lang/openjdk7/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
cvs diff -r1.53 -r1.54 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2014/09/13 14:35:25 1.53
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2014/09/22 11:54:45 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.53 2014/09/13 14:35:25 joerg Exp $ 1$NetBSD: distinfo,v 1.54 2014/09/22 11:54:45 joerg Exp $
2 2
3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f 4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes 5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
6SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 6SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
7RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 7RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
8Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes 8Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 9SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 10RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes 11Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
12SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d 12SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
13RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 13RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
14Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes 14Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
@@ -59,27 +59,27 @@ SHA1 (patch-am) = d3ea039c882a73ff370b2c @@ -59,27 +59,27 @@ SHA1 (patch-am) = d3ea039c882a73ff370b2c
59SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd 59SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
60SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 60SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503
61SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476 61SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476
62SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d 62SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
63SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec 63SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
64SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2 64SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2
65SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3 65SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3
66SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf 66SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf
67SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 67SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423
68SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 68SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
69SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 69SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
70SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a 70SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
71SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620 71SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620
72SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 14c5beeb30789360a989d4233dbcddba21b98021 72SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = ca95d6cb163c863a8716a3ae8889c0d08d128925
73SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 73SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
74SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 74SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756
75SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58 75SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58
76SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169 76SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169
77SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf 77SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
78SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 1b89ef4ac8bd6a1b5cf3f35935976d85b4f9dbb1 78SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 1b89ef4ac8bd6a1b5cf3f35935976d85b4f9dbb1
79SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 79SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
80SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 80SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
81SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd 81SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd
82SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c 82SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c
83SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b 83SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b
84SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02 84SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02
85SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a 85SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Defs-java.gmk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Defs-java.gmk 2014/09/13 14:35:25 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Defs-java.gmk 2014/09/22 11:54:45 1.3
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.2 2014/09/13 14:35:25 joerg Exp $ 1$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.3 2014/09/22 11:54:45 joerg Exp $
2 2
3--- corba/make/common/shared/Defs-java.gmk.orig 2014-01-05 23:11:01.000000000 +0000 3--- corba/make/common/shared/Defs-java.gmk.orig 2014-01-05 23:11:01.000000000 +0000
4+++ corba/make/common/shared/Defs-java.gmk 4+++ corba/make/common/shared/Defs-java.gmk
5@@ -59,7 +59,7 @@ endif 5@@ -59,7 +59,7 @@ endif
6 # Options for hotspot to turn off printing of options with fastdebug version 6 # Options for hotspot to turn off printing of options with fastdebug version
7 # and creating the hotspot.log file. 7 # and creating the hotspot.log file.
8 JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \ 8 JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
9- -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput 9- -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
10+ -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms512m -XX:+UseSerialGC 10+ -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms512m -XX:+UseSerialGC
11  11
12 # JVM options 12 # JVM options
13 JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS) 13 JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
 14@@ -196,8 +196,8 @@ BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
 15
 16 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
 17 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
 18-BOOT_JAR_CMD = $(BOOTDIR)/bin/jar
 19-BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
 20+BOOT_JAR_CMD = $(BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m
 21+BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner -J-XX:+UseSerialGC -J-mx1024m
 22
 23 # Various tools we need to run (FIXUP: Are these the right ones?)
 24 NATIVE2ASCII = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)