diff options
| author | tnn <tnn> | 2016-06-10 10:12:49 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2016-06-10 10:12:49 +0000 |
| commit | cdd5fdeece0628ae3b13059e9e05e2aa00352d14 (patch) | |
| tree | e775273359703d0d1de923d35e291827ce71fc51 /lang/openjdk8/Makefile | |
| parent | dada6897ab09d793687ff0ec162addf953fc74ec (diff) | |
| download | pkgsrc-cdd5fdeece0628ae3b13059e9e05e2aa00352d14.tar.gz | |
paxctl needs to go before shell script switcheroos take place
Diffstat (limited to 'lang/openjdk8/Makefile')
| -rw-r--r-- | lang/openjdk8/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 91acec24900..963310c54ab 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2016/06/01 00:40:40 pgoyette Exp $ +# $NetBSD: Makefile,v 1.36 2016/06/10 10:12:49 tnn Exp $ DISTNAME= openjdk-1.8.92-20160506 PKGNAME= openjdk8-1.8.92 @@ -184,9 +184,6 @@ ${WRKDIR}/stage1-done: # stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now ${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done -.if defined(BATCH) - @${RECURSIVE_MAKE} ${MAKEFLAGS} apply-va-hack -.endif .if defined(TOOLS_PLATFORM.paxctl) ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]* ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]* @@ -194,6 +191,9 @@ ${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} |