pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openjdk25: add proper Linux support



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Sep 6 21:31:42 2026 +0200
Changeset:	0e1fbaf605e1d8b5e2202d483961ce7ad5adcbed

Modified Files:
	openjdk25/Makefile
	openjdk25/PLIST
	openjdk25/bootstrap.mk
	openjdk25/distinfo
Added Files:
	openjdk25/PLIST.Linux

Log Message:
openjdk25: add proper Linux support

Will make it easier to maintain bootstrap kits.

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

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

diffstat:
 openjdk25/Makefile     |  5 +++++
 openjdk25/PLIST        |  4 ++--
 openjdk25/PLIST.Linux  | 25 +++++++++++++++++++++++++
 openjdk25/bootstrap.mk | 11 +++++++++--
 openjdk25/distinfo     |  3 +++
 5 files changed, 44 insertions(+), 4 deletions(-)

diffs:
diff --git a/openjdk25/Makefile b/openjdk25/Makefile
index 392fa31335..b414a49f4b 100644
--- a/openjdk25/Makefile
+++ b/openjdk25/Makefile
@@ -151,6 +151,11 @@ SUBST_SED.kqueue+=		-e 's/static final int EV_CLEAR   = 0x0020;/static final int
 TOOLS_PLATFORM.unzip=
 .endif
 
+PLIST_VARS+=		bsd-fontconfig
+.if ${OPSYS} == "NetBSD"
+PLIST.bsd-fontconfig=	yes
+.endif
+
 post-extract:
 # 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.
diff --git a/openjdk25/PLIST b/openjdk25/PLIST
index 913c468532..8867144c76 100644
--- a/openjdk25/PLIST
+++ b/openjdk25/PLIST
@@ -501,8 +501,8 @@ java/openjdk25/legal/jdk.zipfs/ASSEMBLY_EXCEPTION
 java/openjdk25/legal/jdk.zipfs/LICENSE
 java/openjdk25/lib/classlist
 java/openjdk25/lib/ct.sym
-java/openjdk25/lib/fontconfig.bfc
-java/openjdk25/lib/fontconfig.properties.src
+${PLIST.bsd-fontconfig}java/openjdk25/lib/fontconfig.bfc
+${PLIST.bsd-fontconfig}java/openjdk25/lib/fontconfig.properties.src
 java/openjdk25/lib/jfr/default.jfc
 java/openjdk25/lib/jfr/profile.jfc
 java/openjdk25/lib/jrt-fs.jar
diff --git a/openjdk25/PLIST.Linux b/openjdk25/PLIST.Linux
new file mode 100644
index 0000000000..c5a00ebf67
--- /dev/null
+++ b/openjdk25/PLIST.Linux
@@ -0,0 +1,25 @@
+@comment $NetBSD$
+java/openjdk25/bin/jhsdb
+java/openjdk25/bin/jhsdb${DBGEXT}
+java/openjdk25/bin/jpackage
+java/openjdk25/bin/jpackage${DBGEXT}
+java/openjdk25/conf/sdp/sdp.conf.template
+java/openjdk25/jmods/jdk.hotspot.agent.jmod
+java/openjdk25/jmods/jdk.jpackage.jmod
+java/openjdk25/legal/jdk.hotspot.agent/ADDITIONAL_LICENSE_INFO
+java/openjdk25/legal/jdk.hotspot.agent/ASSEMBLY_EXCEPTION
+java/openjdk25/legal/jdk.hotspot.agent/LICENSE
+java/openjdk25/legal/jdk.incubator.vector/sleef.md
+java/openjdk25/legal/jdk.jpackage/ADDITIONAL_LICENSE_INFO
+java/openjdk25/legal/jdk.jpackage/ASSEMBLY_EXCEPTION
+java/openjdk25/legal/jdk.jpackage/LICENSE
+java/openjdk25/lib/jexec
+java/openjdk25/lib/jexec${DBGEXT}
+java/openjdk25/lib/libjsvml${DBGEXT}
+java/openjdk25/lib/libjsvml.so
+java/openjdk25/lib/libsaproc${DBGEXT}
+java/openjdk25/lib/libsaproc.so
+java/openjdk25/lib/libsctp${DBGEXT}
+java/openjdk25/lib/libsctp.so
+java/openjdk25/lib/libsimdsort${DBGEXT}
+java/openjdk25/lib/libsimdsort.so
diff --git a/openjdk25/bootstrap.mk b/openjdk25/bootstrap.mk
index 1f66107d9a..798553dc42 100644
--- a/openjdk25/bootstrap.mk
+++ b/openjdk25/bootstrap.mk
@@ -8,8 +8,15 @@ PKG_FAIL_REASON+=		"Only supports NetBSD >= 9"
 PKG_FAIL_REASON+=		"Only supports NetBSD >= 9.4"
 .endif
 
-# FIXME add new boostrap kits here.
+ONLY_FOR_PLATFORM+=		Linux-*-x86_64
+BOOT.linux-amd64=		OpenJDK25U-jdk_x64_linux_hotspot_25.0.4.1_1.tar.gz
+SITES.${BOOT.linux-amd64}=	https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.4.1%2B1/
+.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo)
+DISTFILES+=			${BOOT.linux-amd64}
+EXTRACT_ONLY+=			${BOOT.linux-amd64}
+ALT_BOOTDIR=			${WRKDIR}/jdk-25.0.4.1+1
+.endif
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib
 
-ALT_BOOTDIR=		${WRKDIR}/bootstrap
+ALT_BOOTDIR?=		${WRKDIR}/bootstrap
diff --git a/openjdk25/distinfo b/openjdk25/distinfo
index 451b6dd9d0..dcdfd02f20 100644
--- a/openjdk25/distinfo
+++ b/openjdk25/distinfo
@@ -1,5 +1,8 @@
 $NetBSD: distinfo,v 1.17 2026/08/16 11:54:29 tnn Exp $
 
+BLAKE2s (OpenJDK25U-jdk_x64_linux_hotspot_25.0.4.1_1.tar.gz) = 472b5de195b366f7e60f02c243155c8b541c9ccb714c0c72f9789dfabd452977
+SHA512 (OpenJDK25U-jdk_x64_linux_hotspot_25.0.4.1_1.tar.gz) = c96f0d7a22068a488c6bc2ef908f946280d26ce384dbd879c6ae9a01a60441cfed8cff97f3dc5f02b939cc9fab5ad9279b5f497a3523195102cfcd151cac0816
+Size (OpenJDK25U-jdk_x64_linux_hotspot_25.0.4.1_1.tar.gz) = 141329719 bytes
 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


Home | Main Index | Thread Index | Old Index