Page MenuHomeFreeBSD
Files F140039230

D50349.id155441.diff
No OneTemporary
Actions

D50349.id155441.diff
View Options

diff --git a/java/openjdk24/Makefile b/java/openjdk24/Makefile
--- a/java/openjdk24/Makefile
+++ b/java/openjdk24/Makefile
@@ -3,6 +3,7 @@
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/bofh/java/openjdk23:boot
MAINTAINER= java@FreeBSD.org
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -106,18 +107,21 @@
.include <bsd.port.pre.mk>
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk24 ${LOCALBASE}/openjdk23
+BOOTSTRAP_ALREADY_INSTALLED= false
# do we have valid native jdk installed?
.for BJDK in ${BOOTSTRAP_JDKS}
. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
BOOTSTRAPJDKDIR= ${BJDK}
+BOOTSTRAP_ALREADY_INSTALLED= true
. endif
.endfor
# if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk23
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk23
+BOOTSTRAPJDKDIR?= ${WRKSRC}/jdk
+BOOTSTRAPJDKFILE= jdk23.0.1+11-freebsd-1-${JDK_ARCH}.tar.gz
+DISTFILES+= ${BOOTSTRAPJDKFILE}:boot
.endif
JDK_BUILD_JVM= server
@@ -167,6 +171,11 @@
-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
${WRKSRC}/make/autoconf/libraries.m4
+pre-configure:
+.if ${BOOTSTRAP_ALREADY_INSTALLED} == false
+ @cd ${WRKSRC} && ${TAR} -x -f ${DISTDIR}/${BOOTSTRAPJDKFILE}
+.endif
+
post-build:
.if defined(OPENJDK_SYMLINK_CACERTS)
@${RM} ${JDK_IMAGEDIR}/lib/security/cacerts
diff --git a/java/openjdk24/distinfo b/java/openjdk24/distinfo
--- a/java/openjdk24/distinfo
+++ b/java/openjdk24/distinfo
@@ -1,3 +1,7 @@
TIMESTAMP = 1745490330
SHA256 (freebsd-openjdk-jdk-24.0.1+9-1-jdk-24.0.1-ga-freebsd-1_GH0.tar.gz) = f9a5a14ba9205bcb6bced5a153d0d726d03c9ffdd459171683a9ade9ac31ea4e
SIZE (freebsd-openjdk-jdk-24.0.1+9-1-jdk-24.0.1-ga-freebsd-1_GH0.tar.gz) = 120804490
+SHA256 (jdk23.0.1+11-freebsd-1-aarch64.tar.gz) = f43e7f70bee836b7dc9956a7ca47edb1d77f176861c24ae747405e272449775c
+SIZE (jdk23.0.1+11-freebsd-1-aarch64.tar.gz) = 261830132
+SHA256 (jdk23.0.1+11-freebsd-1-x86_64.tar.gz) = 00079334c02e17b8843832e9f2445ced0fe917abddd549dc08ed558f5e1c59aa
+SIZE (jdk23.0.1+11-freebsd-1-x86_64.tar.gz) = 248885935

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 20, 9:57 AM (6 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27094830
Default Alt Text
D50349.id155441.diff (2 KB)

Event Timeline