diff options
Diffstat (limited to 'java/openjdk21')
| -rw-r--r-- | java/openjdk21/Makefile | 8 | ||||
| -rw-r--r-- | java/openjdk21/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk21/files/patch-make_autoconf_help.m4 | 11 | ||||
| -rw-r--r-- | java/openjdk21/pkg-message | 6 |
4 files changed, 11 insertions, 20 deletions
diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile index c8dccf841f5f..e0105a14bfb3 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -38,6 +38,8 @@ GH_PROJECT= jdk21u 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= LANG="C" \ LC_ALL="C" \ @@ -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= 21 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 7 -JDK_BUILD_NUMBER= 6 +JDK_PATCH_VERSION= 9 +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 @@ -88,6 +91,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/openjdk21/distinfo b/java/openjdk21/distinfo index b51a8b6b0d62..80e42f997bb5 100644 --- a/java/openjdk21/distinfo +++ b/java/openjdk21/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745168967 -SHA256 (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = ea8634ed1f3bf8aa0df121fa399f4f56ccac135a14ac5c1db8dd3b378f493dfb -SIZE (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = 113408248 +TIMESTAMP = 1762111711 +SHA256 (battleblow-jdk21u-jdk-21.0.9+10-1_GH0.tar.gz) = 07f8277f53844ab7aa45b9ce7aad081a90be4492e5120e80b7c37dd2e16e133a +SIZE (battleblow-jdk21u-jdk-21.0.9+10-1_GH0.tar.gz) = 113912901 diff --git a/java/openjdk21/files/patch-make_autoconf_help.m4 b/java/openjdk21/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk21/files/patch-make_autoconf_help.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- make/autoconf/help.m4.orig 2025-05-24 21:54:30 UTC -+++ make/autoconf/help.m4 -@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS], - fi - fi - if test "x$CONFIGURE_COMMAND_LINE" != x; then -- printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" -+ printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE" - else - printf "using default settings.\n" - fi diff --git a/java/openjdk21/pkg-message b/java/openjdk21/pkg-message index fcb6defe8dcd..811dcb1e3b58 100644 --- a/java/openjdk21/pkg-message +++ b/java/openjdk21/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 } |