openjdk25: fix lint, reduce diff to openjdk21

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openjdk25: fix lint, reduce diff to openjdk21
From: Tobias Nygren (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 5 Sep 2026 09:57:17 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sat Sep 5 11:57:09 2026 +0200
Changeset:	8bd66b4be2795f9861da563457695d5a347df248

Modified Files:
	openjdk25/Makefile
	openjdk25/bootstrap.mk
	openjdk25/distinfo
	openjdk25/patches/patch-make_autoconf_buildjdk-spec.gmk.template
	openjdk25/patches/patch-make_autoconf_hotspot.m4
	openjdk25/patches/patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties
	openjdk25/patches/patch-src_java.desktop_unix_native_common_awt_fontpath.c
	openjdk25/patches/patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c

Log Message:
openjdk25: fix lint, reduce diff to openjdk21

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

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

diffstat:
 openjdk25/Makefile                                 | 10 +++----
 openjdk25/bootstrap.mk                             | 32 +---------------------
 openjdk25/distinfo                                 | 10 +++----
 .../patch-make_autoconf_buildjdk-spec.gmk.template |  5 ++++
 openjdk25/patches/patch-make_autoconf_hotspot.m4   |  2 ++
 ...sktop_bsd_data_fontconfig_fontconfig.properties |  2 ++
 ..._java.desktop_unix_native_common_awt_fontpath.c |  2 ++
 ...ttach_bsd_native_libattach_VirtualMachineImpl.c |  2 ++
 8 files changed, 24 insertions(+), 41 deletions(-)

diffs:
diff --git a/openjdk25/Makefile b/openjdk25/Makefile
index fcfd674954..d66567f3b7 100644
--- a/openjdk25/Makefile
+++ b/openjdk25/Makefile
@@ -9,7 +9,7 @@ GITHUB_TAG=	jdk-25.0.4+7-1
 
 MAINTAINER=	ryoon%NetBSD.org@localhost
 HOMEPAGE=	https://openjdk.java.net/
-COMMENT=	Open-source implementation of the Java Platform, 25
+COMMENT=	Open-source implementation of the Java Platform, 25 LTS
 LICENSE=	gnu-gpl-v2
 
 DISTFILES=	${DEFAULT_DISTFILES}
@@ -27,8 +27,9 @@ TOOL_DEPENDS+=		mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootce
 # For alloca()
 BUILDLINK_TRANSFORM+=		opt:-std=c99:-std=gnu99
 BUILDLINK_TRANSFORM+=		opt:-std=c11:-std=gnu11
-BUILDLINK_TRANSFORM+=		opt:-std=c++14:-std=gnu++14
 BUILDLINK_TRANSFORM+=		opt:-std=c++11:-std=gnu++11
+BUILDLINK_TRANSFORM+=		opt:-std=c++14:-std=gnu++14
+BUILDLINK_TRANSFORM+=		opt:-std=c++17:-std=gnu++17
 # For NetBSD
 #BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
@@ -120,8 +121,7 @@ CWRAPPERS_APPEND.cxx+=	-mstackrealign
 CONFIGURE_ARGS+=	--with-toolchain-type=gcc
 .endif
 
-#.include "bootstrap.mk"
-ALT_BOOTDIR=/path/to/binary-jdk/jdk-25.0.4.1+1
+.include "bootstrap.mk"
 .include "options.mk"
 
 SUBST_CLASSES+=		libpath
@@ -137,7 +137,7 @@ SUBST_CLASSES+=			fontpaths
 SUBST_STAGE.fontpaths=		pre-configure
 SUBST_MESSAGE.fontpaths=	fixing font paths
 SUBST_FILES.fontpaths=		src/java.desktop/bsd/data/fontconfig/fontconfig.properties
-#SUBST_FILES.fontpaths+=		src/java.desktop/unix/native/common/awt/fontpath.c
+SUBST_FILES.fontpaths+=		src/java.desktop/unix/native/common/awt/fontpath.c
 SUBST_VARS.fontpaths=		PREFIX BUILDLINK_PREFIX.fontconfig
 
 
diff --git a/openjdk25/bootstrap.mk b/openjdk25/bootstrap.mk
index 258a72b2e0..1f66107d9a 100644
--- a/openjdk25/bootstrap.mk
+++ b/openjdk25/bootstrap.mk
@@ -8,37 +8,7 @@ PKG_FAIL_REASON+=		"Only supports NetBSD >= 9"
 PKG_FAIL_REASON+=		"Only supports NetBSD >= 9.4"
 .endif
 
-ONLY_FOR_PLATFORM+=		NetBSD-*-i386
-BOOT.nb9-i386=			bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz
-SITES.${BOOT.nb9-i386}=		${MASTER_SITE_LOCAL:=openjdk21/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
-DISTFILES+=			${BOOT.nb9-i386}
-EXTRACT_ONLY+=			${BOOT.nb9-i386}
-.endif
-
-ONLY_FOR_PLATFORM+=		NetBSD-*-x86_64
-BOOT.nb9-amd64=			bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz
-SITES.${BOOT.nb9-amd64}=	${MASTER_SITE_LOCAL:=openjdk21/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
-DISTFILES+=			${BOOT.nb9-amd64}
-EXTRACT_ONLY+=			${BOOT.nb9-amd64}
-.endif
-
-ONLY_FOR_PLATFORM+=		NetBSD-*-aarch64
-BOOT.nb9-aarch64=		bootstrap-jdk-1.21.0.7.6-netbsd-9-aarch64-20250811.tar.xz
-SITES.${BOOT.nb9-aarch64}=	${MASTER_SITE_LOCAL:=openjdk21/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo)
-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:=openjdk21/}
-#.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo)
-#DISTFILES+=			${BOOT.nb9-earmv6hf}
-#EXTRACT_ONLY+=			${BOOT.nb9-earmv6hf}
-#.endif
+# FIXME add new boostrap kits here.
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
 
diff --git a/openjdk25/distinfo b/openjdk25/distinfo
index febe79b7e9..55697b9355 100644
--- a/openjdk25/distinfo
+++ b/openjdk25/distinfo
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.17 2026/08/16 11:54:29 tnn Exp $
 BLAKE2s (jdk25u-jdk-25.0.4-7-1.tar.gz) = db81e919589070cbef63d5f4df43a690cb5119a72f75b12eb1a289621b4e2b97
 SHA512 (jdk25u-jdk-25.0.4-7-1.tar.gz) = ac564673ce14b192f3136d3d92e6125d412f1f449b3fcbe1f47dd0af7a6ccf6ec4a8f4c5074dcab17faf09fc2df54e0430c1e28ea7b8e171169ad97f2213b3fe
 Size (jdk25u-jdk-25.0.4-7-1.tar.gz) = 119810522 bytes
-SHA1 (patch-make_autoconf_buildjdk-spec.gmk.template) = 6edee4455dff6f967b6a209c18824b780b5fae8b
+SHA1 (patch-make_autoconf_buildjdk-spec.gmk.template) = e9123dee6507aea4a0748d513f2f6301edc88e7f
 SHA1 (patch-make_autoconf_flags-cflags.m4) = 7b77e6688805e4c290b5a5948c054463225ccd2d
-SHA1 (patch-make_autoconf_hotspot.m4) = b3d70d7def7b4b0c4ae2632be75bfbe97f931879
+SHA1 (patch-make_autoconf_hotspot.m4) = 6097c29677f4b84c3821b5cf7ac8c397376027d0
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 5f5b638a08abf2f2066a122a825cfa3db9e95139
 SHA1 (patch-make_autoconf_lib-freetype.m4) = bd791b99e4fd87f24432831fba1e814dd199445f
@@ -13,7 +13,7 @@ SHA1 (patch-make_autoconf_lib-x11.m4) = 38038e6d7cfc2d15fb3537a52f11d2961cc2ec99
 SHA1 (patch-make_common_native_Link.gmk) = b453202c240959e42f1a1ba6dc84ce6c9f3a5dcc
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = 989bd899a7a65ad0e498dc9a4b377cd3f511d4d8
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
-SHA1 (patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties) = 32eda43f536dc3a9afb4f1f5f7acae8cb020d546
-SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = 4a65df0bf84af967f230636f1da1ec75fbb3f691
+SHA1 (patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties) = 01aff1bb2c14265b0ebcc9d12fba8d48b876d36e
+SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = 11f4b918f5f30b8f937308ed1263f11357283fc5
 SHA1 (patch-src_java.desktop_unix_native_libpipewire_include_spa_utils_string.h) = f677c9b907b285d6b84de65396f50e2a5e52caba
-SHA1 (patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c) = d21ee47472098fa664f8823f6ccb323d54eaf34f
+SHA1 (patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c) = c83c71af78634aa153d21635ed627236b289ff7f
diff --git a/openjdk25/patches/patch-make_autoconf_buildjdk-spec.gmk.template b/openjdk25/patches/patch-make_autoconf_buildjdk-spec.gmk.template
index 24b161db09..6891c32862 100644
--- a/openjdk25/patches/patch-make_autoconf_buildjdk-spec.gmk.template
+++ b/openjdk25/patches/patch-make_autoconf_buildjdk-spec.gmk.template
@@ -1,5 +1,10 @@
 $NetBSD$
 
+Use the same variant for the buildjdk as the target jdk.
+This is needed for native builds on platforms where hotspot is broken or not
+supported. In that case the buildjdk can't be hardcoded to "server" but must
+use "zero". This is fine for pkgsrc since we only ever build one variant.
+
 --- make/autoconf/buildjdk-spec.gmk.template.orig	2026-07-24 17:22:09.000000000 +0000
 +++ make/autoconf/buildjdk-spec.gmk.template
 @@ -95,8 +95,9 @@ ENABLE_DEBUG_SYMBOLS := false
diff --git a/openjdk25/patches/patch-make_autoconf_hotspot.m4 b/openjdk25/patches/patch-make_autoconf_hotspot.m4
index bf3230e9d4..4edb35de95 100644
--- a/openjdk25/patches/patch-make_autoconf_hotspot.m4
+++ b/openjdk25/patches/patch-make_autoconf_hotspot.m4
@@ -1,5 +1,7 @@
 $NetBSD: patch-make_autoconf_hotspot.m4,v 1.1 2023/11/22 14:06:50 ryoon Exp $
 
+Fix buildjdk targeting for 32-bit ARM.
+
 --- make/autoconf/hotspot.m4.orig	2023-10-23 01:33:53.000000000 +0000
 +++ make/autoconf/hotspot.m4
 @@ -112,6 +112,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
diff --git a/openjdk25/patches/patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties b/openjdk25/patches/patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties
index e8f5ad1830..371e8ca0f9 100644
--- a/openjdk25/patches/patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties
+++ b/openjdk25/patches/patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties
@@ -1,5 +1,7 @@
 $NetBSD: patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties,v 1.1 2023/11/22 14:06:50 ryoon Exp $
 
+Use pkgsrc fontconfig.
+
 --- src/java.desktop/bsd/data/fontconfig/fontconfig.properties.orig	2023-10-23 01:33:53.000000000 +0000
 +++ src/java.desktop/bsd/data/fontconfig/fontconfig.properties
 @@ -167,26 +167,26 @@ sequence.fallback=chinese-big5,chinese-g
diff --git a/openjdk25/patches/patch-src_java.desktop_unix_native_common_awt_fontpath.c b/openjdk25/patches/patch-src_java.desktop_unix_native_common_awt_fontpath.c
index 5fd03254e0..33728d03ac 100644
--- a/openjdk25/patches/patch-src_java.desktop_unix_native_common_awt_fontpath.c
+++ b/openjdk25/patches/patch-src_java.desktop_unix_native_common_awt_fontpath.c
@@ -1,5 +1,7 @@
 $NetBSD: patch-src_java.desktop_unix_native_common_awt_fontpath.c,v 1.1 2023/11/22 14:06:50 ryoon Exp $
 
+Use pkgsrc fonts.
+
 --- src/java.desktop/unix/native/common/awt/fontpath.c.orig	2023-10-23 13:40:41.097871989 +0000
 +++ src/java.desktop/unix/native/common/awt/fontpath.c
 @@ -52,8 +52,8 @@
diff --git a/openjdk25/patches/patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c b/openjdk25/patches/patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c
index 6401bdc885..c00d97becb 100644
--- a/openjdk25/patches/patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c
+++ b/openjdk25/patches/patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c
@@ -1,5 +1,7 @@
 $NetBSD: patch-src_jdk.attach_bsd_native_libattach_VirtualMachineImpl.c,v 1.1 2025/11/15 12:17:12 ryoon Exp $
 
+Fix casting issue?
+
 --- src/jdk.attach/bsd/native/libattach/VirtualMachineImpl.c.orig	2025-11-01 06:31:36.000000000 +0000
 +++ src/jdk.attach/bsd/native/libattach/VirtualMachineImpl.c
 @@ -31,7 +31,9 @@
Prev by Date: pmonitor: install binary as executable
Next by Date: openjdk25: update JAVA_WRAPPERS
Previous by Thread: pmonitor: install binary as executable
Next by Thread: openjdk25: update JAVA_WRAPPERS
Indexes:
Home | Main Index | Thread Index | Old Index