[pkgsrc/trunk]: pkgsrc/lang/openjdk8 paxctl needs to go before shell script s...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/725de2dc10c3
branches:  trunk
changeset: 348234:725de2dc10c3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jun 10 10:12:49 2016 +0000

description:
paxctl needs to go before shell script switcheroos take place

diffstat:

 lang/openjdk8/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r af096d375b6c -r 725de2dc10c3 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Fri Jun 10 09:06:41 2016 +0000
+++ b/lang/openjdk8/Makefile    Fri Jun 10 10:12:49 2016 +0000
@@ -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 @@
 
 # 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 @@
        ${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}