CVS commit: pkgsrc/lang/openjdk8

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  9 20:47:26 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk8: Makefile distinfo
Added Files:
        pkgsrc/lang/openjdk8/patches: patch-make_common_NativeCompilation.gmk

Log Message:
openjdk8: handle paxctl +m internally to the build


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk8/patches/patch-make_common_NativeCompilation.gmk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.97 pkgsrc/lang/openjdk8/Makefile:1.98
--- pkgsrc/lang/openjdk8/Makefile:1.97  Wed May  6 10:16:29 2020
+++ pkgsrc/lang/openjdk8/Makefile       Sat May  9 20:47:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2020/05/06 10:16:29 jmcneill Exp $
+# $NetBSD: Makefile,v 1.98 2020/05/09 20:47:26 tnn Exp $
 
 DISTNAME=      openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=       openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -70,13 +70,6 @@ CONFIGURE_ARGS+=     --with-extra-ldflags=${
 CHECK_PORTABILITY_SKIP+=       hotspot/test/runtime/*/*.sh
 CHECK_PORTABILITY_SKIP+=       hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
 
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/[a-ik-z]*
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/j[b-z]*
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/jar*
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/java
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/java[a-z]*
-NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/jre/bin/*
-
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=     JAVA_HOME=
 MAKE_ENV+=     CLASSPATH=
@@ -186,6 +179,7 @@ post-extract:
 .if exists(/usr/lib/libstdc++.so.7)
        ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
 .endif
+# This can be removed after bootstrap kits have been refreshed
 .if defined(TOOLS_PLATFORM.paxctl)
        ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
        ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
@@ -208,13 +202,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(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}

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.78 pkgsrc/lang/openjdk8/distinfo:1.79
--- pkgsrc/lang/openjdk8/distinfo:1.78  Mon May  4 21:32:15 2020
+++ pkgsrc/lang/openjdk8/distinfo       Sat May  9 20:47:26 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2020/05/04 21:32:15 tnn Exp $
+$NetBSD: distinfo,v 1.79 2020/05/09 20:47:26 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -125,3 +125,4 @@ SHA1 (patch-jdk_test_java_beans_Introspe
 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
 SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba
+SHA1 (patch-make_common_NativeCompilation.gmk) = 8c1e0fd1e9eaa4be6db4b1622f199a063d923e20

Added files:

Index: pkgsrc/lang/openjdk8/patches/patch-make_common_NativeCompilation.gmk
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-make_common_NativeCompilation.gmk:1.1
--- /dev/null   Sat May  9 20:47:26 2020
+++ pkgsrc/lang/openjdk8/patches/patch-make_common_NativeCompilation.gmk        Sat May  9 20:47:26 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-make_common_NativeCompilation.gmk,v 1.1 2020/05/09 20:47:26 tnn Exp $
+
+Disable PaX mprotect.
+
+--- make/common/NativeCompilation.gmk.orig     2020-04-15 02:42:06.000000000 +0000
++++ make/common/NativeCompilation.gmk
+@@ -624,6 +624,9 @@ endif # no MacOS X support yet
+         ifneq (,$$($1_GEN_MANIFEST))
+         $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
+         endif
++        ifeq ($(OPENJDK_TARGET_OS_VENDOR), netbsd)
++        /usr/sbin/paxctl +m $$@
++        endif
+         # This only works if the openjdk_codesign identity is present on the system. Let
+         # silently fail otherwise.
+         ifneq (,$(CODESIGN))