summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-05-27 04:57:16 +0000
committerwiz <wiz@pkgsrc.org>2016-05-27 04:57:16 +0000
commite3d957df8308cfae87c65854a3b1cacf5d3ef176 (patch)
tree5c5964c98e3d9a6785e5aa6a57f256d0a8e3bf50 /lang
parentff6a04c41dac252b1de559a85a1b26c5e5af0786 (diff)
downloadpkgsrc-e3d957df8308cfae87c65854a3b1cacf5d3ef176.tar.gz
Add some paxctls to fix build on NetBSD-current.
Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/openjdk8/Makefile23
1 files changed, 22 insertions, 1 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 72901559419..848811583f0 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2016/05/06 13:37:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2016/05/27 04:57:16 wiz Exp $
DISTNAME= openjdk-1.8.92-20160506
PKGNAME= openjdk8-1.8.92
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.xz
@@ -62,6 +63,12 @@ CONFIGURE_ARGS+= --with-update-version=${PKGVERSION_NOREV:S/1.8.//}
CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh
+NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/[a-ik-z]*
+NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/j[b-z]*
+NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/jar*
+NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java
+NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java[a-z]*
+
# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
MAKE_ENV+= JAVA_HOME=
MAKE_ENV+= CLASSPATH=
@@ -154,6 +161,13 @@ post-extract:
.if exists(/usr/lib/libstdc++.so.7)
${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
.endif
+.if defined(TOOLS_PLATFORM.paxctl)
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
+.endif
do-build: ${WRKDIR}/stage3-done
@@ -172,6 +186,13 @@ ${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]*
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
+ ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
+.endif
@${STEP_MSG} "Reconfiguring with newly built JDK"
@${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
touch ${.TARGET}