We have bootstrap for amd64-current.

[Christos Zoulas <christos%zoulas.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Christos Zoulas <christos%zoulas.com@localhost>
Pushed By:	christos
Date:		Sun Nov 7 07:46:56 2021 -0500
Changeset:	46db6fa7f863a82c73b42d6a6a6bb28424747581

Modified Files:
	openjdk16/README
	openjdk16/bootstrap.mk
	openjdk16/distinfo

Log Message:
We have bootstrap for amd64-current.

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

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

diffstat:
 openjdk16/README       | 37 +++++++++++++++++++------------------
 openjdk16/bootstrap.mk |  8 ++++----
 openjdk16/distinfo     |  8 ++++----
 3 files changed, 27 insertions(+), 26 deletions(-)

diffs:
diff --git a/openjdk16/README b/openjdk16/README
index 29d65cb2df..36a305b250 100644
--- a/openjdk16/README
+++ b/openjdk16/README
@@ -1,5 +1,4 @@
-This package does not work yet, because the jmod version of the tool
-it builds segfaults frequently.
+This package works. Note cwrappers issue below:
 
 Traditionally pkgsrc does not allow $ORIGIN and that leads to very
 invasive changes to the jdk. The build system used LD_LIBRARY_PATH
@@ -10,28 +9,30 @@ ones and fail. This is also the reason we can't bootstrap from the
 linux jdk and we need to bootstrap from NetBSD that has the same
 version.
 
-This build uses the linux jdk to bootstrap, and to be able to do
-this in will use $ORIGIN. In my opinion $ORIGIN is a lesser evil
-that $LD_LIBRARY_PATH.
+This build can either use the linux jdk to bootstrap, or a NetBSD
+previous build. To be able to do this it will use $ORIGIN.
+In my opinion $ORIGIN is a lesser evil that $LD_LIBRARY_PATH.
 
 Here are the instructions to build:
 
 Cwrappers filters out $ORIGIN, so the first step is to apply
-cwrappers.diff in this directory and re-install cwrappers. This
-will allow link lines that contain $ORIGIN.
+cwrappers.diff found in this directory and re-install cwrappers.
+This will allow link lines that contain $ORIGIN.
 
-Next install openjdk-bin. This is the latest openjdk-16 running
-under linux emulation. Make sure it works.
+If you want to build i386 or aarch64:
+    - install openjdk-bin. This is the latest openjdk-16 running
+      under linux emulation. Make sure it works.
+    - run make extract. This will extract the openjdk and bootstrap:
+	$ cd $WORKDIR
+	$ mv bootstrap{,.old}
+	$ ln -s /usr/pkg/java/openjdk-bin bootstrap
 
-Then run make extract. This will extract the openjdk and bootstrap.
-cd $WORKDIR and
-	mv bootstrap{,.old}
-	ln -s /usr/pkg/java/openjdk-bin bootstrap
+If you want to install amd64, we have a bootstrap, nothing needs to be done.
 
-then
-export MAKE_JOBS=<something> to make the build go faster.
+'export MAKE_JOBS=<something>' to make the build go faster.
 
-Then make
+Then run 'make'.
 
-If the build stalls because one of the openjdk-bin binaries SEGV'd
-kill the build and restart it.
+For linux bootstraps:
+    - If the build stalls because one of the openjdk-bin binaries SEGV'd
+      kill the build and restart it.
diff --git a/openjdk16/bootstrap.mk b/openjdk16/bootstrap.mk
index 1178c870f4..76613df437 100644
--- a/openjdk16/bootstrap.mk
+++ b/openjdk16/bootstrap.mk
@@ -10,11 +10,11 @@ EXTRACT_ONLY+=			${BOOT.nb7-i386}
 .endif
 
 ONLY_FOR_PLATFORM+=		NetBSD-*-x86_64
-BOOT.nb7-amd64=			bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz
-SITES.${BOOT.nb7-amd64}=	${MASTER_SITE_LOCAL:=openjdk11/}
+BOOT.nb10-amd64=		bootstrap-jdk-1.16.0.1-netbsd-9.99.92-amd64-20211106.tar.gz
+SITES.${BOOT.nb10-amd64}=	${MASTER_SITE_LOCAL:=openjdk16/}
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
-DISTFILES+=			${BOOT.nb7-amd64}
-EXTRACT_ONLY+=			${BOOT.nb7-amd64}
+DISTFILES+=			${BOOT.nb10-amd64}
+EXTRACT_ONLY+=			${BOOT.nb10-amd64}
 .endif
 
 ONLY_FOR_PLATFORM+=		NetBSD-*-aarch64
diff --git a/openjdk16/distinfo b/openjdk16/distinfo
index 2c31d555d7..608ccd8ed8 100644
--- a/openjdk16/distinfo
+++ b/openjdk16/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.22 2021/02/06 13:02:45 tnn Exp $
 
-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
-RMD160 (jdk16u-jdk-16.0.1-9-1.tar.gz) = 8c1f71379730fdd8dbac1c122066658fd99a6ef6
+BLAKE2s (bootstrap-jdk-1.16.0.1-netbsd-9.99.92-amd64-20211106.tar.gz) = c56a60d22e204e36cc40f93c47d29a9752e51ed1db9e7df8a54356ec8dbb5d34
+SHA512 (bootstrap-jdk-1.16.0.1-netbsd-9.99.92-amd64-20211106.tar.gz) = 00b0739340e6f691b817925c4471f093b04a57a1b03f39694b12c9a7cc5b3b2a3773d80170ebe6bf3c0b4c972b10397ac243687da50abe685b8f9b18e0774a6d
+Size (bootstrap-jdk-1.16.0.1-netbsd-9.99.92-amd64-20211106.tar.gz) = 370408229 bytes
+BLAKE2s (jdk16u-jdk-16.0.1-9-1.tar.gz) = b644b11853f64581836d8c1cc4c660f75f19d29de578ad51193177ed58138bd0
 SHA512 (jdk16u-jdk-16.0.1-9-1.tar.gz) = 45ae7a7d14d26b85e917d9002fe525a9a3472c8ef2a8ad13d3a78fe0f85c2ebda53fd26a6d395aaed1a1bbff99287db69037410bd15bed61b3484df5a7428f7d
 Size (jdk16u-jdk-16.0.1-9-1.tar.gz) = 104513577 bytes
 SHA1 (patch-make_autoconf_flags-cflags.m4) = e09a84bcdeccb8a55b2de5003e839b7b311c3115