diff options
Diffstat (limited to 'java/openjdk17')
| -rw-r--r-- | java/openjdk17/Makefile | 15 | ||||
| -rw-r--r-- | java/openjdk17/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp | 10 | ||||
| -rw-r--r-- | java/openjdk17/pkg-message | 6 |
4 files changed, 27 insertions, 10 deletions
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 5f9671287f89..b28a2c3a2475 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -38,7 +38,9 @@ GH_PROJECT= jdk17u NO_CCACHE= yes -_MAKE_JOBS= # +# 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= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ @@ -47,6 +49,7 @@ MAKE_ENV= LANG="C" \ CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ + LOG=cmdlines \ MAKEFLAGS="" JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} @@ -62,8 +65,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 17 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 15 -JDK_BUILD_NUMBER= 6 +JDK_PATCH_VERSION= 17 +JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= 1 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 @@ -89,6 +92,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 \ @@ -112,6 +116,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# portsfallout.com shows flapping builds on 13.5 and 14.2 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 +MAKE_JOBS_NUMBER_LIMIT= 3 +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17 # do we have valid native jdk installed? diff --git a/java/openjdk17/distinfo b/java/openjdk17/distinfo index cfddd904e761..3dd968836649 100644 --- a/java/openjdk17/distinfo +++ b/java/openjdk17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745164265 -SHA256 (battleblow-jdk17u-jdk-17.0.15+6-1_GH0.tar.gz) = 243d616e60735f375a66d2ae0e4d45200d5d3695549caf7a66aa85273857e9dd -SIZE (battleblow-jdk17u-jdk-17.0.15+6-1_GH0.tar.gz) = 107603484 +TIMESTAMP = 1762108077 +SHA256 (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 99bd33ce8cc618576e8693b9af1bb48059cb5011286009d46a0fabd2d8d36ba8 +SIZE (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 108082578 diff --git a/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp b/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp new file mode 100644 index 000000000000..9a0b26e3aa04 --- /dev/null +++ b/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp @@ -0,0 +1,10 @@ +--- src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp ++++ src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp +@@ -31,6 +31,7 @@ + #include "prims/jniFastGetField.hpp" + #include "prims/jvm_misc.hpp" + #include "prims/jvmtiExport.hpp" ++#include "runtime/thread.inline.hpp" + #include "runtime/safepoint.hpp" + #include "runtime/threadWXSetters.inline.hpp" + diff --git a/java/openjdk17/pkg-message b/java/openjdk17/pkg-message index fcb6defe8dcd..811dcb1e3b58 100644 --- a/java/openjdk17/pkg-message +++ b/java/openjdk17/pkg-message @@ -1,17 +1,15 @@ [ { type: install message: <<EOM -This OpenJDK implementation may require fdescfs(5) mounted on /dev/fd -and procfs(5) mounted on /proc for some applications. +This OpenJDK implementation may require procfs(5) mounted on /proc for some +applications. If you have not done it yet, please do the following: - mount -t fdescfs fdesc /dev/fd mount -t procfs proc /proc To make it permanent, you need the following lines in /etc/fstab: - fdesc /dev/fd fdescfs rw 0 0 proc /proc procfs rw 0 0 EOM } |