CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May 25 19:41:49 UTC 2022

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

Log Message:
openjdk{11,17}: add bootstrap for NetBSD earmv[67]hf

Caution: It takes ~2 days to build on typical 32-bit hardware.
I recommend to build in a 32-bit chroot on aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/openjdk11/bootstrap.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/openjdk17/bootstrap.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk17/distinfo

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

Modified files:

Index: pkgsrc/lang/openjdk11/bootstrap.mk
diff -u pkgsrc/lang/openjdk11/bootstrap.mk:1.5 pkgsrc/lang/openjdk11/bootstrap.mk:1.6
--- pkgsrc/lang/openjdk11/bootstrap.mk:1.5      Sun May 15 22:44:24 2022
+++ pkgsrc/lang/openjdk11/bootstrap.mk  Wed May 25 19:41:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: bootstrap.mk,v 1.5 2022/05/15 22:44:24 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2022/05/25 19:41:49 tnn Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 8"
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && ${OPSYS_VERSION} < 099983
+.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983
 PKG_FAIL_REASON+=              "PR 55248: please update to NetBSD >= 9.99.83 to use this package"
 .endif
 
@@ -32,6 +32,14 @@ DISTFILES+=                  ${BOOT.nb9-aarch64}
 EXTRACT_ONLY+=                 ${BOOT.nb9-aarch64}
 .endif
 
+ONLY_FOR_PLATFORM+=            NetBSD-*-earmv[67]hf
+BOOT.nb8-earmv6hf=             bootstrap-jdk-1.11.0.7.10-netbsd-8-earmv6hf-20220525.tar.xz
+SITES.${BOOT.nb8-earmv6hf}=    ${MASTER_SITE_LOCAL:=openjdk11/}
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo)
+DISTFILES+=                    ${BOOT.nb8-earmv6hf}
+EXTRACT_ONLY+=                 ${BOOT.nb8-earmv6hf}
+.endif
+
 CONFIGURE_ENV+=                LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
 
 ALT_BOOTDIR=           ${WRKDIR}/bootstrap

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.32 pkgsrc/lang/openjdk11/distinfo:1.33
--- pkgsrc/lang/openjdk11/distinfo:1.32 Wed May 25 06:05:34 2022
+++ pkgsrc/lang/openjdk11/distinfo      Wed May 25 19:41:49 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2022/05/25 06:05:34 tnn Exp $
+$NetBSD: distinfo,v 1.33 2022/05/25 19:41:49 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = b57b09661581b7dc6e3700a777f030dfa2fef6f953533456686bfd0dde9157d0
 SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
@@ -6,6 +6,9 @@ Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-
 BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = c54603eabe28bae659a2042cb3b69588840a57502e741c3de333ac70ea1dedc2
 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
+BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
+SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-8-earmv6hf-20220525.tar.xz) = c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
+Size (bootstrap-jdk-1.11.0.7.10-netbsd-8-earmv6hf-20220525.tar.xz) = 92279544 bytes
 BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf
 SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
 Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes

Index: pkgsrc/lang/openjdk17/bootstrap.mk
diff -u pkgsrc/lang/openjdk17/bootstrap.mk:1.5 pkgsrc/lang/openjdk17/bootstrap.mk:1.6
--- pkgsrc/lang/openjdk17/bootstrap.mk:1.5      Sun May 15 22:44:24 2022
+++ pkgsrc/lang/openjdk17/bootstrap.mk  Wed May 25 19:41:49 2022
@@ -1,10 +1,10 @@
-# $NetBSD: bootstrap.mk,v 1.5 2022/05/15 22:44:24 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2022/05/25 19:41:49 tnn Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 9"
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && ${OPSYS_VERSION} < 099983
+.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) ||!empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983
 PKG_FAIL_REASON+=              "PR 55248: please update to NetBSD >= 9.99.83 to use this package"
 .endif
 
@@ -32,6 +32,14 @@ DISTFILES+=                  ${BOOT.nb9-aarch64}
 EXTRACT_ONLY+=                 ${BOOT.nb9-aarch64}
 .endif
 
+ONLY_FOR_PLATFORM+=            NetBSD-*-earmv[67]hf
+BOOT.nb9-earmv6hf=             bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz
+SITES.${BOOT.nb9-earmv6hf}=    ${MASTER_SITE_LOCAL:=openjdk17/}
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo)
+DISTFILES+=                    ${BOOT.nb9-earmv6hf}
+EXTRACT_ONLY+=                 ${BOOT.nb9-earmv6hf}
+.endif
+
 CONFIGURE_ENV+=                LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
 
 ALT_BOOTDIR=           ${WRKDIR}/bootstrap

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.6 pkgsrc/lang/openjdk17/distinfo:1.7
--- pkgsrc/lang/openjdk17/distinfo:1.6  Wed May 25 06:05:34 2022
+++ pkgsrc/lang/openjdk17/distinfo      Wed May 25 19:41:49 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2022/05/25 06:05:34 tnn Exp $
+$NetBSD: distinfo,v 1.7 2022/05/25 19:41:49 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = b632092d25292e795a2d7567ec55d03f21021dbba27eab3e81a48aed5e5bdd68
 SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = fb86749d56be94cc1509f92d8fbdec481b0c7f6fdd5e731826098e6eaa668539052571ffd09125346c1920262b07857ea675799ab8476fcff53c03e158536c1d
@@ -6,6 +6,9 @@ Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-
 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-earmv6hf-20220525.tar.xz) = 1ae4c68999fa355ef677bd7b70570012e4634c2ba4ef1c239316ca2ee8eabb83
+SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz) = 9a71a9a3ae7765934fb8ced51e3f419236c183efed33095665e0632abd78fe9ba91181037afe6ad2f074b3b0da9a624a5bc3d534ca90dd491eadbaabcf6ff03e
+Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz) = 96766088 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