aboutsummaryrefslogtreecommitdiff
path: root/java/openjdk24
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk24')
-rw-r--r--java/openjdk24/Makefile12
-rw-r--r--java/openjdk24/distinfo6
-rw-r--r--java/openjdk24/files/patch-make_autoconf_flags-cflags.m419
-rw-r--r--java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c89
4 files changed, 20 insertions, 106 deletions
diff --git a/java/openjdk24/Makefile b/java/openjdk24/Makefile
index 454ef1d87149..3b2e0110d69e 100644
--- a/java/openjdk24/Makefile
+++ b/java/openjdk24/Makefile
@@ -1,6 +1,7 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@@ -35,17 +36,19 @@ CPE_VENDOR= oracle
USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_PROJECT= openjdk
-GH_TAGNAME= jdk-24.0.2-ga-freebsd-1
+GH_TAGNAME= jdk-24.0.2-ga-freebsd-2
NO_CCACHE= yes
+# Suppress passing -j to do-build target via Mk/bsd.port.mk
+# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N
+_MAKE_JOBS= #
MAKE_ENV= CLASSPATH="" \
JAVA_HOME="" \
LD_LIBRARY_PATH="" \
+ LOG=cmdlines \
MAKEFLAGS=""
-MAKE_JOBS_UNSAFE= yes
-
JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
@@ -62,7 +65,7 @@ JDK_MAJOR_VERSION= 24
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 2
JDK_BUILD_NUMBER= 12
-BSD_JDK_VERSION= 1
+BSD_JDK_VERSION= 2
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
@@ -82,6 +85,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
--with-giflib-lib=${LOCALBASE}/lib \
--with-harfbuzz=system \
--with-libpng=system \
+ --with-num-cores=${MAKE_JOBS_NUMBER} \
--with-zlib=system \
--with-lcms=system \
--x-includes=${LOCALBASE}/include \
diff --git a/java/openjdk24/distinfo b/java/openjdk24/distinfo
index 869ee42cffd6..d0f99f6fd72b 100644
--- a/java/openjdk24/distinfo
+++ b/java/openjdk24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752740904
-SHA256 (freebsd-openjdk-jdk-24.0.2+12-1-jdk-24.0.2-ga-freebsd-1_GH0.tar.gz) = 2d8ae839763932bbc5d85f1a129a0ec9c972af59b40eb2b3e7bacb238a67f132
-SIZE (freebsd-openjdk-jdk-24.0.2+12-1-jdk-24.0.2-ga-freebsd-1_GH0.tar.gz) = 120897722
+TIMESTAMP = 1756894463
+SHA256 (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 707a120215130b7d82a344f19ec801efaa70edaad38d6417fd1a47a6da58c395
+SIZE (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 120881959
diff --git a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
index 5156c18515da..81bc372519f5 100644
--- a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
+++ b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
@@ -1,13 +1,12 @@
---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC
+--- make/autoconf/flags-cflags.m4.orig 2025-09-16 10:24:48 UTC
+++ make/autoconf/flags-cflags.m4
-@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
- # for all archs except arm and ppc, prevent gcc to omit frame pointer
- $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
+@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
fi
-+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
-+ if test "x$FLAGS_CPU" = xppc64; then
-+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
-+ fi
++ if test "x$FLAGS_CPU" = xppc64; then
++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
++ fi
fi
-
- elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+ if test "x$OPENJDK_TARGET_OS" = xaix; then
+ $1_CFLAGS_CPU="-mcpu=pwr8"
diff --git a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
deleted file mode 100644
index 421548d0f4a5..000000000000
--- a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig 2023-10-01 03:54:04 UTC
-+++ src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
-@@ -58,6 +58,7 @@
- #include <unistd.h>
-
- #ifdef __FreeBSD__
-+#include <sys/user.h>
- #include <vm/vm_param.h>
- #endif
-
-@@ -177,23 +178,43 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
- }
- return t_info.virtual_size;
- #elif defined(__FreeBSD__)
-- FILE *fp;
-- unsigned long end, start;
-- jlong total = 0;
-+ int mib[4];
-+ struct kinfo_vmentry *kve;
-+ long total = 0;
-+ size_t len = 0;
-+ int error;
-+ char *buf, *bp, *eb;
-
-- if ((fp = fopen("/proc/curproc/map", "r")) == NULL) {
-- throw_internal_error(env, "Unable to open /proc/curproc/map");
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_VMMAP;
-+ mib[3] = getpid();
-+ error = sysctl(mib, 4, NULL, &len, NULL, 0);
-+ if (error) {
-+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
- return -1;
- }
--
-- for (;;) {
-- // Ignore everything except start and end entries
-- if (fscanf(fp, "0x%lx 0x%lx %*[^\n]\n", &start, &end) != 2 || start > end)
-- break;
-- total += end - start;
-+ len = len * 4 / 3;
-+ buf = malloc(len);
-+ if (buf == NULL) {
-+ throw_internal_error(env, "Fail to allocate memory");
-+ return -1;
- }
--
-- fclose(fp);
-+ error = sysctl(mib, 4, buf, &len, NULL, 0);
-+ if (error) {
-+ throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
-+ return -1;
-+ }
-+ bp = buf;
-+ eb = buf + len;
-+ while (bp < eb) {
-+ kve = (struct kinfo_vmentry *)(uintptr_t)bp;
-+ if (kve->kve_structsize == 0)
-+ break;
-+ bp += kve->kve_structsize;
-+ total += kve->kve_end - kve->kve_start;
-+ }
-+ free(buf);
- return total;
- #else /* _ALLBSD_SOURCE */
- /*
-@@ -403,6 +424,21 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
- return nfiles;
- #elif defined(__OpenBSD__)
- return getdtablecount();
-+#elif defined(__FreeBSD__)
-+ int mib[4];
-+ int error;
-+ int nfds;
-+ size_t len;
-+
-+ len = sizeof(nfds);
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_NFDS;
-+ mib[3] = 0;
-+
-+ if (sysctl(mib, 4, &nfds, &len, NULL, 0) == -1)
-+ return -1;
-+ return nfds;
- #else /* solaris/linux */
- DIR *dirp;
- struct dirent* dentp;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-06 19:17:11 +0000