diff options
| author | tnn <tnn@pkgsrc.org> | 2020-03-22 22:06:02 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-03-22 22:06:02 +0000 |
| commit | bdb87f8f5c5161b8238f40ca00742ee94daf28ae (patch) | |
| tree | 4310b14b674be0453546669c96969cdf72a65c0a /lang | |
| parent | 558206e7015ecef2e76932124a19177e84f69c43 (diff) | |
| download | pkgsrc-bdb87f8f5c5161b8238f40ca00742ee94daf28ae.tar.gz | |
openjdk8: remove va-hack now that we have UNLIMIT_RESOURCES+=virtualsize
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk8/Makefile | 7 | ||||
| -rw-r--r-- | lang/openjdk8/hacks.mk | 30 |
2 files changed, 3 insertions, 34 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 5975b356fbc..f0b5e5eb009 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -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/build-aux/autoconf-config.sub 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}/stage1-done ${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} diff --git a/lang/openjdk8/hacks.mk b/lang/openjdk8/hacks.mk index c183c1ea3b0..d0c2453ccd0 100644 --- a/lang/openjdk8/hacks.mk +++ b/lang/openjdk8/hacks.mk @@ -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 |