diff options
| author | tnn <tnn> | 2015-03-05 16:35:49 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-05 16:35:49 +0000 |
| commit | 574f0dd4f423f04b9686466687d1b627cdafbb9d (patch) | |
| tree | 1a3715cecfe7cca0bbdbe9dc235d279dd2e7dec7 /lang/openjdk8/Makefile | |
| parent | 858b7e3d31938b0bb327979125799358f9b99370 (diff) | |
| download | pkgsrc-574f0dd4f423f04b9686466687d1b627cdafbb9d.tar.gz | |
Do the previous hack differently since joerg@ objected. Also wrap it in
ifdef BATCH since it works around an artificially introduced limit.
Diffstat (limited to 'lang/openjdk8/Makefile')
| -rw-r--r-- | lang/openjdk8/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 05e644883b4..84a36e8b7a7 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/03/02 14:27:38 tnn Exp $ +# $NetBSD: Makefile,v 1.12 2015/03/05 16:35:49 tnn Exp $ DISTNAME= openjdk-1.8.31-20150207 PKGNAME= openjdk8-1.8.31 @@ -153,7 +153,11 @@ ${WRKDIR}/stage1-done: # stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now ${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done - ${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure +.if defined(BATCH) + @${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack +.endif + @${STEP_MSG} "Reconfiguring with newly built JDK" + @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure touch ${.TARGET} # stage 2 rebuilds the JDK using native tools @@ -171,7 +175,7 @@ ${WRKDIR}/cacerts.out: for cert in ${WRKDIR}/cacerts/*.pem; do \ ${INFO_MSG} "Importing $$cert" && \ ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \ - ${BUILDDIR}/images/j2sdk-image/bin/keytool \ + ${ALT_BOOTDIR}/bin/keytool \ -noprompt \ -importcert \ -keystore ${.TARGET} \ |