[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Clean up +UseSerialGC handling and ensur...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/openjdk7 Clean up +UseSerialGC handling and ensur...
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:19:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/01f2c4291226
branches:  trunk
changeset: 646458:01f2c4291226
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Feb 09 00:42:17 2015 +0000

description:
Clean up +UseSerialGC handling and ensure it is set for the entire build.
(has anyone analyzed the concurrent GC memory allocation problem?)
Bump PKGREVISION for this and previous changes.

diffstat:

 lang/openjdk7/Makefile                                                |   7 +-
 lang/openjdk7/distinfo                                                |  25 +++---
 lang/openjdk7/patches/patch-am                                        |   4 +-
 lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk    |   8 +-
 lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make |   6 +-
 lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make     |  34 +++++++--
 lang/openjdk7/patches/patch-jaxp_build.xml                            |   4 +-
 lang/openjdk7/patches/patch-jaxp_make_Makefile                        |   4 +-
 lang/openjdk7/patches/patch-jaxws_build.xml                           |  13 +++
 lang/openjdk7/patches/patch-jaxws_make_Makefile                       |   4 +-
 lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk      |   4 +-
 lang/openjdk7/patches/patch-jdk_test_Makefile                         |   6 +-
 lang/openjdk7/patches/patch-langtools_make_Makefile                   |   4 +-
 lang/openjdk7/patches/patch-langtools_make_build.xml                  |  10 +-
 14 files changed, 84 insertions(+), 49 deletions(-)

diffs (truncated from 402 to 300 lines):

diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/Makefile    Mon Feb 09 00:42:17 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2015/02/08 23:40:09 tnn Exp $
+# $NetBSD: Makefile,v 1.90 2015/02/09 00:42:17 tnn Exp $
 
 DISTNAME=      openjdk-1.7.76-20150127
 PKGNAME=       openjdk7-1.7.76
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
@@ -52,6 +52,9 @@
 MAKE_ENV+=     NO_DOCS=true
 MAKE_ENV+=     SKIP_COMPARE_IMAGES=true
 
+ALL_ENV+=      PKGSRC_BOOT_JDK_JVMARGS="-XX:+UseSerialGC -Xmx768M"
+ALL_ENV+=      PKGSRC_BOOT_JDK_TOOLARGS="-J-XX:+UseSerialGC -J-Xmx768M"
+
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=     JAVA_HOME=
 MAKE_ENV+=     CLASSPATH=
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/distinfo    Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2015/02/08 23:40:09 tnn Exp $
+$NetBSD: distinfo,v 1.70 2015/02/09 00:42:17 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -51,7 +51,7 @@
 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2
 SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897
 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
-SHA1 (patch-am) = d3ea039c882a73ff370b2c7bd6be94136b9f2bbb
+SHA1 (patch-am) = 4bf7b6b211e0775dcdb0273214f57cc63b5f0ed6
 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
 SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08
 SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476
@@ -65,13 +65,13 @@
 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
 SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620
-SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = ca95d6cb163c863a8716a3ae8889c0d08d128925
+SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 94df9729510a3c194017fb978e79e1194e393e38
 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) = aed6cab66a8c55a2214432cb531fe0d5a9239d55
+SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 90076fcafa5b7076083a71294a065a8c26ded3f7
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
-SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ba5bbe69d44143105bc74641bc55f3814d55abb0
+SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ae10595d897a43bfd716a2b52a7836aa919e435e
 SHA1 (patch-hotspot_make_bsd_makefiles_zeroshark.make) = fe0e3d001f2ff996c44dd977595e08c06f911773
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
@@ -101,9 +101,10 @@
 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_build.xml) = 9f6b45a11302a652244d6b6e201dbfda7d16773b
-SHA1 (patch-jaxp_make_Makefile) = 8f5f74f62bd6b68a493105524e311eea50003dec
-SHA1 (patch-jaxws_make_Makefile) = 4f2181844246441a930daa80b2dc892fede6e6c3
+SHA1 (patch-jaxp_build.xml) = 3c539e2667a7ba86f1034607b3dc67fe7f14267a
+SHA1 (patch-jaxp_make_Makefile) = 4e65defb4ccd973cc13f343cf5931781c6091d51
+SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2
+SHA1 (patch-jaxws_make_Makefile) = fcaa667aa1187fd4f8f639d625c22f7a43abb642
 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
@@ -115,7 +116,7 @@
 SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
 SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce
 SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
-SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c
+SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = b152a234b95609fb30e131eb2a244319e0f3dde5
 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
 SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
@@ -153,12 +154,12 @@
 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) = 2fb1a5bf1e33cc2d984bfd73af78bf66b31b5acb
+SHA1 (patch-jdk_test_Makefile) = 4c6e2bbc39b9d8a7825ae3cb2e49f8fbe82c5e89
 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_Makefile) = 450febe135718d5e48365598de9d102cb04379c4
-SHA1 (patch-langtools_make_build.xml) = 7ebfdf37f60e8e45f35fbcf1b4d8687a0014e581
+SHA1 (patch-langtools_make_Makefile) = 816b02a95d6e1eb2f46f3cb95a0f69bc479ba2de
+SHA1 (patch-langtools_make_build.xml) = 6e885603fd406782d05b936317dcce77cca73227
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-am
--- a/lang/openjdk7/patches/patch-am    Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-am    Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2014/09/13 14:35:25 joerg Exp $
+$NetBSD: patch-am,v 1.6 2015/02/09 00:42:17 tnn Exp $
 
 Set username to pkgsrc.
 
@@ -18,7 +18,7 @@
  
  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)'
++ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -Xmx768M JAVA_HOME='$(BOOTDIR)'
  
  ifeq ($(ANT_HOME),)
    ANT = $(ANT_WORKAROUNDS) ant
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
--- a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk        Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk        Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.3 2014/09/22 11:54:45 joerg Exp $
+$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.4 2015/02/09 00:42:17 tnn 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 @@
  #   and creating the hotspot.log file.
  JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
 -   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xms512m -XX:+UseSerialGC
++   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput $(PKGSRC_BOOT_JDK_JVMARGS)
  
  # JVM options
  JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
@@ -17,8 +17,8 @@
  BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
 -BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
 -BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-+BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m
-+BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner -J-XX:+UseSerialGC -J-mx1024m
++BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner $(PKGSRC_BOOT_JDK_TOOLARGS)
  
  # Various tools we need to run (FIXUP: Are these the right ones?)
  NATIVE2ASCII    = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make     Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make     Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.2 2015/01/29 21:29:32 joerg Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- hotspot/make/bsd/makefiles/buildtree.make.orig     2014-01-06 02:36:18.000000000 +0000
 +++ hotspot/make/bsd/makefiles/buildtree.make
@@ -7,7 +7,7 @@
  
  # For now, until the compiler is less wobbly:
 -TESTFLAGS     = -Xbatch -showversion
-+TESTFLAGS     = -Xbatch -showversion -Xmx512m -XX:+UseSerialGC
++TESTFLAGS     = -Xbatch -showversion $(PKGSRC_BOOT_JDK_JVMARGS)
  
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
@@ -16,7 +16,7 @@
        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 "\$${JAVA_HOME}/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS) -d . $(GAMMADIR)/make/test/Queens.java"; \
        echo ""; \
        echo "# Set library path solely for gamma launcher test run"; \
        echo ""; \
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make Mon Feb 09 00:42:17 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.2 2015/01/27 12:31:06 ryoon Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- hotspot/make/bsd/makefiles/rules.make.orig 2015-01-26 15:21:52.000000000 +0000
 +++ hotspot/make/bsd/makefiles/rules.make
-@@ -68,12 +68,12 @@ REMOVE_TARGET   = rm -f $@
+@@ -68,24 +68,24 @@ REMOVE_TARGET   = rm -f $@
  
  ifdef ALT_BOOTDIR
  
@@ -12,12 +12,30 @@
 -RUN.JAR   = $(ALT_BOOTDIR)/bin/jar
 -COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
 -COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
-+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 -J-XX:+UseSerialGC -J-mx1024m
-+COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic -J-XX:+UseSerialGC -J-mx1024m
++RUN.JAVA  = $(ALT_BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
++RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAR   = $(ALT_BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
  BOOT_JAVA_HOME = $(ALT_BOOTDIR)
  
  else
+ 
+ ifdef BOOTDIR
+ 
+-RUN.JAVA  = $(BOOTDIR)/bin/java
+-RUN.JAVAP = $(BOOTDIR)/bin/javap
+-RUN.JAVAH = $(BOOTDIR)/bin/javah
+-RUN.JAR   = $(BOOTDIR)/bin/jar
+-COMPILE.JAVAC = $(BOOTDIR)/bin/javac
+-COMPILE.RMIC  = $(BOOTDIR)/bin/rmic
++RUN.JAVA  = $(BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
++RUN.JAVAP = $(BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAVAH = $(BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
++RUN.JAR   = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.JAVAC = $(BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
++COMPILE.RMIC  = $(BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
+ BOOT_JAVA_HOME = $(BOOTDIR)
+ 
+ else
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-jaxp_build.xml
--- a/lang/openjdk7/patches/patch-jaxp_build.xml        Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-jaxp_build.xml        Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxp_build.xml,v 1.1 2014/10/04 22:47:32 joerg Exp $
+$NetBSD: patch-jaxp_build.xml,v 1.2 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxp/build.xml.orig        2014-09-29 08:29:49.000000000 +0000
 +++ jaxp/build.xml
@@ -7,7 +7,7 @@
               target="${javac.target}">
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
 +            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-mx1024m"/>
++            <compilerarg value="-J-Xmx768M"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
          </javac>
      </target>
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-jaxp_make_Makefile
--- a/lang/openjdk7/patches/patch-jaxp_make_Makefile    Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-jaxp_make_Makefile    Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxp_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
+$NetBSD: patch-jaxp_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxp/make/Makefile.orig    2014-09-12 20:54:09.000000000 +0000
 +++ jaxp/make/Makefile
@@ -6,7 +6,7 @@
  #
  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
  
-+ANT_OPTS += -XX:+UseSerialGC -mx1024m
++ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
 +export ANT_OPTS
  ifdef QUIET
    ANT_OPTIONS += -quiet
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-jaxws_build.xml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk7/patches/patch-jaxws_build.xml       Mon Feb 09 00:42:17 2015 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-jaxws_build.xml,v 1.1 2015/02/09 00:42:17 tnn Exp $
+
+--- jaxws/build.xml.orig       2015-01-26 15:22:17.000000000 +0000
++++ jaxws/build.xml
+@@ -145,6 +145,8 @@
+              source="${javac.source}"
+            debug="${javac.debug}"
+              target="${javac.target}">
++            <compilerarg value="-J-XX:+UseSerialGC"/>
++            <compilerarg value="-J-Xmx768M"/>
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-jaxws_make_Makefile
--- a/lang/openjdk7/patches/patch-jaxws_make_Makefile   Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-jaxws_make_Makefile   Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-jaxws_make_Makefile,v 1.2 2015/01/23 15:43:45 joerg Exp $
+$NetBSD: patch-jaxws_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
 
 --- jaxws/make/Makefile.orig   2014-10-04 13:30:47.000000000 +0000
 +++ jaxws/make/Makefile
@@ -6,7 +6,7 @@
  #
  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
  
-+ANT_OPTS += -XX:+UseSerialGC -mx1024m
++ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
 +export ANT_OPTS
  ifdef QUIET
    ANT_OPTIONS += -quiet
diff -r faceef0fd448 -r 01f2c4291226 lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
--- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk  Sun Feb 08 23:40:09 2015 +0000
+++ b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk  Mon Feb 09 00:42:17 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.1 2014/01/20 19:25:11 joerg Exp $
+$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.2 2015/02/09 00:42:17 tnn Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of net/tacacs to 4.0.4.28.
Next by Date: [pkgsrc/trunk]: pkgsrc/games/maelstrom-sdl Update to 3.0.6. Freshen up HOMEP...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of net/tacacs to 4.0.4.28.
Next by Thread: [pkgsrc/trunk]: pkgsrc/games/maelstrom-sdl Update to 3.0.6. Freshen up HOMEP...
Indexes:
Home | Main Index | Thread Index | Old Index