CVS commit: pkgsrc/lang/openjdk8

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 22 22:06:02 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk8: Makefile hacks.mk

Log Message:
openjdk8: remove va-hack now that we have UNLIMIT_RESOURCES+=virtualsize


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/openjdk8/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.92 pkgsrc/lang/openjdk8/Makefile:1.93
--- pkgsrc/lang/openjdk8/Makefile:1.92  Tue Mar 10 22:10:24 2020
+++ pkgsrc/lang/openjdk8/Makefile       Sun Mar 22 22:06:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2020/03/10 22:10:24 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2020/03/22 22:06:02 tnn Exp $
 
 DISTNAME=      openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=       openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -37,7 +37,7 @@ CONFIG_SUB_OVERRIDE+= common/autoconf/bu
 CONFIG_GUESS_OVERRIDE+=        common/autoconf/build-aux/autoconf-config.guess
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bash gmake pax pkg-config unzip:run zip:run
-UNLIMIT_RESOURCES=     datasize stacksize
+UNLIMIT_RESOURCES=     datasize stacksize virtualsize
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
 CHECK_SHLIBS_SKIP+=    java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libinstrument.so
 
@@ -212,9 +212,6 @@ ${WRKDIR}/stage1_5-done: ${WRKDIR}/stage
        ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
        ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
 .endif
-.if defined(BATCH)
-       @${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack
-.endif
        @${STEP_MSG} "Reconfiguring with newly built JDK"
        @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
        touch ${.TARGET}

Index: pkgsrc/lang/openjdk8/hacks.mk
diff -u pkgsrc/lang/openjdk8/hacks.mk:1.8 pkgsrc/lang/openjdk8/hacks.mk:1.9
--- pkgsrc/lang/openjdk8/hacks.mk:1.8   Sun Nov  3 19:04:04 2019
+++ pkgsrc/lang/openjdk8/hacks.mk       Sun Mar 22 22:06:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.8 2019/11/03 19:04:04 rillig Exp $
+# $NetBSD: hacks.mk,v 1.9 2020/03/22 22:06:02 tnn Exp $
 
 .if !defined(OPENJDK8_HACKS_MK)
 OPENJDK8_HACKS_MK=     # empty
@@ -12,34 +12,6 @@ post-wrapper:
        ${RM} -f ${BUILDLINK_DIR}/include/jmorecfg.h
        ${RM} -f ${BUILDLINK_DIR}/include/jpeglib.h
 
-# Don't reserve more memory than we need.
-# Fixes build in artificially VA constrained environment.
-#
-VA_HACK_ARGS=  -XX:ReservedCodeCacheSize=128M
-VA_HACK_ARGS+= -XX:MaxMetaspaceSize=768M
-.if ${MACHINE_ARCH} == "x86_64"
-VA_HACK_ARGS+= -XX:CompressedClassSpaceSize=128M
-.endif
-.PHONY: apply-va-hack
-apply-va-hack:
-       @${STEP_MSG} "Bulk build: reducing VA usage for tools in ${ALT_BOOTDIR}"
-.for t in bin/java
-       @test -f ${ALT_BOOTDIR}/${t}.real ||    \
-               mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real
-       @echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t} && \
-        echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:M*} "$$@"' >> \
-               ${ALT_BOOTDIR}/${t}     && \
-        chmod +x ${ALT_BOOTDIR}/${t}
-.endfor
-.for t in bin/jar bin/jarsigner bin/javac bin/javah bin/javap bin/keytool bin/native2ascii bin/rmic
-       @test -f ${ALT_BOOTDIR}/${t}.real ||    \
-               mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real
-       @echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t} && \
-        echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:C/^/-J/} "$$@"' >> \
-               ${ALT_BOOTDIR}/${t}     && \
-        chmod +x ${ALT_BOOTDIR}/${t}
-.endfor
-
 # Workaround incorrect constant folding of subnormals in javac when the FPU
 # does not handle subnormal arithmetic, like on ARM in Flush-to-zero mode.
 # These workarounds avoid underflow conditions during the bootstrap so the