opendjdk11: uploaded bootstrap binaries

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

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sat Sep 28 10:57:46 2019 +0200
Changeset:	036d5c119e2c81e781d95a22590bce1490324cb0

Modified Files:
	openjdk11/Makefile
	openjdk11/bootstrap.mk
	openjdk11/distinfo
	openjdk11/options.mk

Log Message:
opendjdk11: uploaded bootstrap binaries

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=036d5c119e2c81e781d95a22590bce1490324cb0

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

diffstat:
 openjdk11/Makefile     | 10 +++++++---
 openjdk11/bootstrap.mk |  4 ++--
 openjdk11/distinfo     |  8 ++++++++
 openjdk11/options.mk   | 19 ++++++++++++++++---
 4 files changed, 33 insertions(+), 8 deletions(-)

diffs:
diff --git a/openjdk11/Makefile b/openjdk11/Makefile
index bfb3339182..a36ee984c2 100644
--- a/openjdk11/Makefile
+++ b/openjdk11/Makefile
@@ -62,9 +62,6 @@ CONFIGURE_ARGS+=	--with-extra-cxxflags=${CXXFLAGS:Q}
 CONFIGURE_ARGS+=	--disable-warnings-as-errors
 CONFIGURE_ARGS+=	--with-cacerts-file=${WRKDIR}/cacerts.out
 CONFIGURE_ARGS+=	--with-default-make-target=product-images
-# static libstdc++ is useful for bootstrap binaries, otherwise not so much.
-# Note: on NetBSD you need to use libstdc++_pic.a
-CONFIGURE_ARGS+=	--with-stdc++lib=dynamic
 # It is intentional to use CONFIGURE_ARGS instead of CONFIGURE_ENV here.
 CONFIGURE_ARGS+=	USER=pkgsrc
 
@@ -135,6 +132,13 @@ PLIST.internal_vm_compiler=	yes
 TOOLS_PLATFORM.unzip=
 .endif
 
+post-extract:
+# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
+# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
+.if exists(/lib/libgcc_s.so.1)
+        ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so*
+.endif
+
 pre-configure: ${WRKDIR}/cacerts.out
 
 ${WRKDIR}/cacerts.out:
diff --git a/openjdk11/bootstrap.mk b/openjdk11/bootstrap.mk
index 02ed50fa55..4b4e57e58e 100644
--- a/openjdk11/bootstrap.mk
+++ b/openjdk11/bootstrap.mk
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
-BOOT.nb7-i386=		bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190926.tar.xz
+BOOT.nb7-i386=		bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz
 SITES.${BOOT.nb7-i386}=	${MASTER_SITE_LOCAL:=openjdk11/}
-BOOT.nb7-amd64=		bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190926.tar.xz
+BOOT.nb7-amd64=		bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz
 SITES.${BOOT.nb7-amd64}=${MASTER_SITE_LOCAL:=openjdk11/}
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
diff --git a/openjdk11/distinfo b/openjdk11/distinfo
index 74351ee2a7..4a20374ba9 100644
--- a/openjdk11/distinfo
+++ b/openjdk11/distinfo
@@ -1,5 +1,13 @@
 $NetBSD$
 
+SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
+RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
+SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
+Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
+SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710
+RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339
+SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
+Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
 SHA1 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = a504adfdb0f63994831b45c15b40dc62c266b910
 RMD160 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = 375b579a76fac1bf8af13b19f8968c5be13835e3
 SHA512 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = 62009410d337e0da5b6f008659c401aa856346efdd57d179c081f7971881b289b075074738f1cd1a9085defebdfba8941fabdf7b6b75e226213503df9a065b4b
diff --git a/openjdk11/options.mk b/openjdk11/options.mk
index 613ca57cb5..2d1e4f62d9 100644
--- a/openjdk11/options.mk
+++ b/openjdk11/options.mk
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openjdk11
 PKG_OPTIONS_OPTIONAL_GROUPS=	variant
 PKG_OPTIONS_GROUP.variant=	jdk-zero-vm
-PKG_SUPPORTED_OPTIONS=		debug dtrace jre-jce x11
+PKG_SUPPORTED_OPTIONS=		debug dtrace jre-jce x11 static-libstdcpp
 PKG_SUGGESTED_OPTIONS=		jre-jce x11
 
 .if !empty(PKGSRC_COMPILER:Mclang)
@@ -68,8 +68,6 @@ BUILDLINK_DEPMETHOD.libXrandr?=build
 .include "../../x11/libXrandr/buildlink3.mk"
 .endif
 
-
-
 #
 # Debugging
 #
@@ -90,6 +88,21 @@ CONFIGURE_ARGS+=	--enable-dtrace=yes
 CONFIGURE_ARGS+=	--enable-dtrace=no
 .endif
 
+#
+# static libstdc++ and libgcc
+#
+# On NetBSD you need to use libstdc++_pic.a when creating a shared library,
+# but I don't think there is any easy way to tell the compiler to do this.
+# Also, -static-libgcc doesn't work because libpthread needs dynamic
+# linkage of libgcc.
+.if !empty(PKG_OPTIONS:Mstatic-libstdcpp)
+. if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)
+BUILDLINK_TRANSFORM+=	rm:-static-libgcc
+. endif
+.else
+CONFIGURE_ARGS+=	--with-stdc++lib=dynamic
+.endif
+
 #
 # Build variant. Zero VM builds a portable JVM without assembly optimization.
 #