CVS commit: pkgsrc/lang/openjdk17

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 15 20:29:01 UTC 2022

Modified Files:
        pkgsrc/lang/openjdk17: Makefile bootstrap.mk distinfo

Log Message:
openjdk17: regen bootstrap binaries to be smaller & more portable

- build without x11
- bundle libstdc++.so.9 & libgcc_s.so.1 from base so it works with
  base clang as well as future NetBSD releases
- don't ship external debug symbols (.diz), demos, src.zip
- build in clean chroot with pkgsrc bootstrapped to /root/pkg
- upload pgp signatures to nbftp

This mimics how it was done for openjdk11 &
takes bootstraps down from ~300MB to ~100MB.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk17/Makefile \
    pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk17/bootstrap.mk

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

Modified files:

Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.3 pkgsrc/lang/openjdk17/Makefile:1.4
--- pkgsrc/lang/openjdk17/Makefile:1.3  Sat May 14 18:17:50 2022
+++ pkgsrc/lang/openjdk17/Makefile      Sun May 15 20:29:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/05/14 18:17:50 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/15 20:29:00 tnn Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -163,10 +163,13 @@ TOOLS_PLATFORM.unzip=
 .endif
 
 post-extract:
-# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
+# These libs are bundled w/ the netbsd-9 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*
+       ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so.1
+.endif
+.if exists(/usr/lib/libstdc++.so.9)
+       ${RM} -f ${ALT_BOOTDIR}/lib/libstdc++.so.9
 .endif
 
 pre-configure: ${WRKDIR}/cacerts.out
Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.3 pkgsrc/lang/openjdk17/distinfo:1.4
--- pkgsrc/lang/openjdk17/distinfo:1.3  Sat May 14 15:23:02 2022
+++ pkgsrc/lang/openjdk17/distinfo      Sun May 15 20:29:00 2022
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.3 2022/05/14 15:23:02 tnn Exp $
+$NetBSD: distinfo,v 1.4 2022/05/15 20:29:00 tnn Exp $
 
-BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = afd8e5dcbfa3d8fe397e97f713d24a1437936dcffbe79f3f0c3e9bfb58bce36d
-SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = f9ddd27ac0ccf77eb72e2c1fe5a06c6431a74b4feeea495233cba058dd8346f215861c59b5228e33729dccdc7f557a29e881123d8592f0cc304536fd5cc3609a
-Size (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = 320259572 bytes
-BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 8a805fb72760eed42d76b12e6fd655e5af73d6825eb7aeb3acd2201d21f43575
-SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 8878e31782352316a2777aeb7262c6e01e994b9ec5d73b9d155bfa015dfc14b15e9cbace127e361778e3aec09b4995a35b9df448a94bf50eb2860469396b7b9e
-Size (bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz) = 288701712 bytes
-BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-9-i386-20220506.tar.xz) = c7468a1619819ac0fa387e011a2b5b8547c4f93b39728a3194f827a2121e1e55
-SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-9-i386-20220506.tar.xz) = c687698cdd8d593e7f4a791b8f8abd85eee61b8800ad819e8d71b8fa4c44485bf4351459c56d933073c6af73cb915a284a3862df331f31659db9426bd163ed05
-Size (bootstrap-jdk-1.17.0.2.8-netbsd-9-i386-20220506.tar.xz) = 277103744 bytes
+BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-amd64-20220515.tar.xz) = 5da928c9ad945b0be6eebdada9788fe0f837a52d1e50ffa3535ef4115700f20a
+SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-amd64-20220515.tar.xz) = 785a6f203e7e5a31f48c708e6a33aa28f00b742226248e2757564d521c580f78070145e4a5dedf3eac1801531781143550c1c127ef6f8d310b88e864d42f4279
+Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-amd64-20220515.tar.xz) = 105391720 bytes
+BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = a8e6a44e1470cf2e8845f6b5a6edff142d06c76e12a793b5991b1bf05cf36a98
+SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = 9fc54d9a31270cbec5e0454bbf1ddf3bb99ab5c916660e1f5e89163b384368a7f1fd5311db71b21c1638eb916899199a1080e90cc1f9615bfdbd871bb94a3216
+Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = 103902136 bytes
 BLAKE2s (jdk17u-jdk-17.0.3-7-1.tar.gz) = d080a7513b3e1d431e24673fff10695adf0154b97fd45be7307be09e929e78a6
 SHA512 (jdk17u-jdk-17.0.3-7-1.tar.gz) = ddbe9c6e2c48c320247e023070de9f4b770a58d6eaf763f6331d6cccfd4bd5591445994174d5196392e5a4f0bb398d6b309e37dc5079c823458ac7fc4d9b6a9d
 Size (jdk17u-jdk-17.0.3-7-1.tar.gz) = 104898973 bytes

Index: pkgsrc/lang/openjdk17/bootstrap.mk
diff -u pkgsrc/lang/openjdk17/bootstrap.mk:1.2 pkgsrc/lang/openjdk17/bootstrap.mk:1.3
--- pkgsrc/lang/openjdk17/bootstrap.mk:1.2      Fri May 13 15:17:13 2022
+++ pkgsrc/lang/openjdk17/bootstrap.mk  Sun May 15 20:29:00 2022
@@ -1,33 +1,28 @@
-# $NetBSD: bootstrap.mk,v 1.2 2022/05/13 15:17:13 ryoon Exp $
+# $NetBSD: bootstrap.mk,v 1.3 2022/05/15 20:29:00 tnn Exp $
 
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
+PKG_SKIP_REASON+=              "Only supports NetBSD >= 9"
+.endif
 
 ONLY_FOR_PLATFORM+=            NetBSD-*-i386
-BOOT.nb9-i386=                 bootstrap-jdk-1.17.0.2.8-netbsd-9-i386-20220506.tar.xz
+BOOT.nb9-i386=                 bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz
 SITES.${BOOT.nb9-i386}=                ${MASTER_SITE_LOCAL:=openjdk17/}
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
 DISTFILES+=                    ${BOOT.nb9-i386}
 EXTRACT_ONLY+=                 ${BOOT.nb9-i386}
 .endif
 
-ONLY_FOR_PLATFORM+=            NetBSD-9.[0-8]*-x86_64
-BOOT.nb9-amd64=                        bootstrap-jdk-1.17.0.2.8-netbsd-9-amd64-20220408.tar.xz
+ONLY_FOR_PLATFORM+=            NetBSD-*-x86_64
+BOOT.nb9-amd64=                        bootstrap-jdk-1.17.0.3.7-netbsd-9-amd64-20220515.tar.xz
 SITES.${BOOT.nb9-amd64}=       ${MASTER_SITE_LOCAL:=openjdk17/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-9.[0-8]*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
 DISTFILES+=                    ${BOOT.nb9-amd64}
 EXTRACT_ONLY+=                 ${BOOT.nb9-amd64}
 .endif
 
-ONLY_FOR_PLATFORM+=            NetBSD-9.9*-x86_64
-BOOT.nb10-amd64=               bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz
-SITES.${BOOT.nb10-amd64}=      ${MASTER_SITE_LOCAL:=openjdk17/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-9.9*-x86_64) || make(distinfo)
-DISTFILES+=                    ${BOOT.nb10-amd64}
-EXTRACT_ONLY+=                 ${BOOT.nb10-amd64}
-.endif
-
-#ONLY_FOR_PLATFORM+=           NetBSD-*-aarch64
-#BOOT.nb9-aarch64=             bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz
-#SITES.${BOOT.nb9-aarch64}=    ${MASTER_SITE_LOCAL:=openjdk11/}
+ONLY_FOR_PLATFORM+=            NetBSD-*-aarch64
+#BOOT.nb9-aarch64=             bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220515.tar.xz
+#SITES.${BOOT.nb9-aarch64}=    ${MASTER_SITE_LOCAL:=openjdk17/}
 #.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo)
 #DISTFILES+=                   ${BOOT.nb9-aarch64}
 #EXTRACT_ONLY+=                        ${BOOT.nb9-aarch64}