Wed Dec 18 12:59:10 2019 UTC ()
openjdk11: remove MAKE_JOBS_SAFE=no on NetBSD

This workaround didn't help. NetBSD is supposedly fixed now.


(wiz)
diff -r1.7 -r1.8 pkgsrc/lang/openjdk11/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2019/11/06 23:04:31 1.7
+++ pkgsrc/lang/openjdk11/Makefile 2019/12/18 12:59:10 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2019/11/06 23:04:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2019/12/18 12:59:10 wiz Exp $
2 2
3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
7GITHUB_PROJECT= openjdk-jdk11u 7GITHUB_PROJECT= openjdk-jdk11u
8GITHUB_TAG= jdk-11.0.5+10-1 8GITHUB_TAG= jdk-11.0.5+10-1
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -115,31 +115,26 @@ SUBST_FILES.fontpaths= make/data/fontco @@ -115,31 +115,26 @@ SUBST_FILES.fontpaths= make/data/fontco
115SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c 115SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c
116SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig 116SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig
117 117
118PLIST_VARS+= aot 118PLIST_VARS+= aot
119PLIST_VARS+= internal_vm_compiler 119PLIST_VARS+= internal_vm_compiler
120.if ${MACHINE_ARCH} == "x86_64" 120.if ${MACHINE_ARCH} == "x86_64"
121PLIST.aot= yes 121PLIST.aot= yes
122PLIST.internal_vm_compiler= yes 122PLIST.internal_vm_compiler= yes
123.endif 123.endif
124 124
125.if ${OPSYS} == "NetBSD" 125.if ${OPSYS} == "NetBSD"
126TOOLS_PLATFORM.unzip= 126TOOLS_PLATFORM.unzip=
127 127
128# not completely true, but too many jobs kill the build on NetBSD 9.99.x 
129# see PR 54619 
130MAKE_JOBS_SAFE= no 
131.endif 
132 
133post-extract: 128post-extract:
134# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with 129# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
135# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base. 130# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
136.if exists(/lib/libgcc_s.so.1) 131.if exists(/lib/libgcc_s.so.1)
137 ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so* 132 ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so*
138.endif 133.endif
139 134
140pre-configure: ${WRKDIR}/cacerts.out 135pre-configure: ${WRKDIR}/cacerts.out
141 136
142${WRKDIR}/cacerts.out: 137${WRKDIR}/cacerts.out:
143 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ 138 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \
144 ${PREFIX}/sbin/mozilla-rootcerts extract 139 ${PREFIX}/sbin/mozilla-rootcerts extract
145 for cert in ${WRKDIR}/cacerts/*.pem; do \ 140 for cert in ${WRKDIR}/cacerts/*.pem; do \