diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk23/Makefile | 187 | ||||
| -rw-r--r-- | java/openjdk23/distinfo | 11 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-configure | 14 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-make_autoconf_flags-cflags.m4 | 13 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-make_autoconf_help.m4 | 11 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-make_autoconf_libraries.m4 | 15 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-src_hotspot_os_bsd_os__bsd.cpp | 11 | ||||
| -rw-r--r-- | java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c | 20 | ||||
| -rw-r--r-- | java/openjdk23/pkg-descr | 8 | ||||
| -rw-r--r-- | java/openjdk23/pkg-message | 15 |
11 files changed, 0 insertions, 306 deletions
diff --git a/java/Makefile b/java/Makefile index be255edd110d..c41c11de0438 100644 --- a/java/Makefile +++ b/java/Makefile @@ -84,7 +84,6 @@ SUBDIR += openjdk17-jre SUBDIR += openjdk21 SUBDIR += openjdk21-jre - SUBDIR += openjdk23 SUBDIR += openjdk24 SUBDIR += openjdk25 SUBDIR += openjdk26 diff --git a/java/openjdk23/Makefile b/java/openjdk23/Makefile deleted file mode 100644 index 687643b00304..000000000000 --- a/java/openjdk23/Makefile +++ /dev/null @@ -1,187 +0,0 @@ -PORTNAME= openjdk -DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 2 -CATEGORIES= java devel -PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -MASTER_SITES= LOCAL/openjdk:boot -DISTFILES= ${BOOTSTRAPJDKFILE}:boot - -MAINTAINER= java@FreeBSD.org -COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} -WWW= https://openjdk.java.net/projects/jdk/23/ - -LICENSE= GPLv2 - -DEPRECATED= No longer supported by upstream -EXPIRATION_DATE= 2026-05-12 - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le - -# On FreeBSD 14 and 15 the i386 build fails with a segfault in java during the -# buildtools_create_symbols_javac__the.COMPILE_CREATE_SYMBOLS_batch build step. -# -BROKEN_FreeBSD_14_i386= Build failed for target 'images' in configuration 'bsd-x86-server-release' -BROKEN_FreeBSD_15_i386= Build failed for target 'images' in configuration 'bsd-x86-server-release' - -BUILD_DEPENDS= zip:archivers/zip \ - ${LOCALBASE}/include/cups/cups.h:print/cups \ - bash:shells/bash \ - gsed:textproc/gsed -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgif.so:graphics/giflib \ - libharfbuzz.so:print/harfbuzz \ - liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png -RUN_DEPENDS= javavm:java/javavmwrapper \ - xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype - -USES= autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig xorg -USE_XORG= x11 xext xi xrandr xrender xt xtst - -CPE_VENDOR= oracle - -USE_GITHUB= yes -GH_ACCOUNT= freebsd -GH_PROJECT= openjdk -GH_TAGNAME= jdk-23.0.2+7-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="CONF_CHECK=ignore" - -JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} -BOOTSTRAPJDKFILE= openjdk23-23.0.2+7.2_1.${JDK_ARCH}.tar.xz -JDK_OSARCH= bsd-${JDK_ARCH} -JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} -.if defined(BUILD_JRE) -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre -.else -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk -.endif -INSTALLDIR= ${PREFIX}/${PKGBASE} -BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk - -NOPRECIOUSMAKEVARS= yes - -JDK_MAJOR_VERSION= 23 -JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 2 -JDK_BUILD_NUMBER= 7 -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 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed -CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ - --disable-ccache \ - --disable-javac-server \ - --with-alsa=${LOCALBASE} \ - --with-cups=${LOCALBASE} \ - --with-fontconfig=${LOCALBASE} \ - --with-freetype=system \ - --with-libjpeg=system \ - --with-giflib=system \ - --with-giflib-include=${LOCALBASE}/include \ - --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 \ - --x-libraries=${LOCALBASE}/lib \ - --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ - --with-native-debug-symbols=none \ - --with-debug-level=release \ - --with-vendor-name="OpenJDK BSD Porting Team" \ - --with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \ - --with-vendor-bug-url="${JDK_BUG_URL}" \ - --with-vendor-vm-bug-url="${JDK_BUG_URL}" - -JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} - -.if defined(BUILD_JRE) -ALL_TARGET= legacy-images -.else -ALL_TARGET= images -.endif -JDK_BUILD_TYPE= release - -.include <bsd.port.pre.mk> - -JDK_BUILD_JVM= server - -MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} -CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} -CONFIGURE_ARGS+= --disable-warnings-as-errors - -.if ${COMPILER_TYPE} == gcc -USE_GCC= yes -CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ - --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ - --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" -.else -MAKE_ENV+= USE_CLANG=true -EXTRA_CFLAGS+= -Wno-unused-but-set-parameter -EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical -EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype -CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}" -CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" -.endif - -.if ${ARCH} == aarch64 -CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace -MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" -.endif - -.if empty(ICONV_LIB) -ICONV_CFLAGS= -DLIBICONV_PLUG -.else -ICONV_CFLAGS= -I${LOCALBASE}/include -ICONV_LDFLAGS= -L${LOCALBASE}/lib -ICONV_LIBS= ${ICONV_LIB} -.endif - -post-patch: - @${RM} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.cpp - @${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.hpp \ - ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.hpp - - @${FIND} ${WRKSRC} -name '*.orig' -delete - @${CHMOD} 755 ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/configure \ - ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp - @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ - -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ - -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ - ${WRKSRC}/make/autoconf/libraries.m4 - -post-build: -.if defined(OPENJDK_SYMLINK_CACERTS) - @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts - @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts -.endif - -do-install: - @${MKDIR} ${STAGEDIR}${INSTALLDIR} - @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} - @cd ${STAGEDIR}${INSTALLDIR} && \ - ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; - @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper - @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ - ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} - -.include <bsd.port.post.mk> diff --git a/java/openjdk23/distinfo b/java/openjdk23/distinfo deleted file mode 100644 index 67a4eb421cfb..000000000000 --- a/java/openjdk23/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -TIMESTAMP = 1756989931 -SHA256 (openjdk23-23.0.2+7.2_1.aarch64.tar.xz) = 73029ace8c87b24435596465ad7091b6d5e0f8b800aa753a80c5c40a7b5e2fe4 -SIZE (openjdk23-23.0.2+7.2_1.aarch64.tar.xz) = 178064508 -SHA256 (openjdk23-23.0.2+7.2_1.ppc64.tar.xz) = c4515a0d6c8cb41ef2b38bad62bd5d2a2f692a3cb90a924758654d26734f8e43 -SIZE (openjdk23-23.0.2+7.2_1.ppc64.tar.xz) = 176905048 -SHA256 (openjdk23-23.0.2+7.2_1.ppc64le.tar.xz) = 6a98d80f60463b81d69c0988ef1aaac389a6f9e965ad3f314cffe5a8a0b40977 -SIZE (openjdk23-23.0.2+7.2_1.ppc64le.tar.xz) = 177821084 -SHA256 (openjdk23-23.0.2+7.2_1.x86_64.tar.xz) = 01774b36af41f4742e217b3e3da498d1670ef5a0b0988ccb33b15ea65bf868be -SIZE (openjdk23-23.0.2+7.2_1.x86_64.tar.xz) = 180088312 -SHA256 (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = ec011f440f6e3f0eff1b67811a3a9fc5094be772f30519af2bfb914abaa6d666 -SIZE (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = 117311366 diff --git a/java/openjdk23/files/patch-configure b/java/openjdk23/files/patch-configure deleted file mode 100644 index 4bc4479f5e4a..000000000000 --- a/java/openjdk23/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2019-03-12 12:38:39.648907000 -0700 -+++ configure 2019-03-12 12:39:04.275572000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!%%LOCALBASE%%/bin/bash - # - # Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -@@ -32,4 +32,4 @@ - # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. - # This trick is needed to get autoconf to co-operate properly. - # The ${-:+-$-} construction passes on bash options. --bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" -+%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" diff --git a/java/openjdk23/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk23/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk23/files/patch-make_autoconf_flags-cflags.m4 +++ /dev/null @@ -1,13 +0,0 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 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" - 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 - fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk23/files/patch-make_autoconf_help.m4 b/java/openjdk23/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk23/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/openjdk23/files/patch-make_autoconf_libraries.m4 b/java/openjdk23/files/patch-make_autoconf_libraries.m4 deleted file mode 100644 index 0911464a6522..000000000000 --- a/java/openjdk23/files/patch-make_autoconf_libraries.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 -+++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 -@@ -188,9 +188,9 @@ - ICONV_LDFLAGS="-L/usr/local/lib" - ICONV_LIBS=-liconv - elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then -- ICONV_CFLAGS=-DLIBICONV_PLUG -- ICONV_LDFLAGS= -- ICONV_LIBS= -+ ICONV_CFLAGS=%%ICONV_CFLAGS%% -+ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% -+ ICONV_LIBS=%%ICONV_LIBS%% - else - ICONV_CFLAGS= - ICONV_LDFLAGS= diff --git a/java/openjdk23/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk23/files/patch-src_hotspot_os_bsd_os__bsd.cpp deleted file mode 100644 index 402f0f475bc3..000000000000 --- a/java/openjdk23/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hotspot/os/bsd/os_bsd.cpp.orig 2021-09-29 21:25:10 UTC -+++ src/hotspot/os/bsd/os_bsd.cpp -@@ -361,7 +361,7 @@ - #elif defined(__NetBSD__) - #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" - #else -- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib" -+ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib" - #endif - #else - #define DEFAULT_LIBPATH OVERRIDE_LIBPATH diff --git a/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c b/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c deleted file mode 100644 index 80ae4c90cdf7..000000000000 --- a/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c.orig 2025-06-27 12:18:08 UTC -+++ src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c -@@ -70,6 +70,9 @@ closeDescriptors(void) - int - closeDescriptors(void) - { -+#if defined(__FreeBSD__) -+ closefrom(STDERR_FILENO + 1); -+#else - DIR *dp; - struct dirent *dirp; - /* leave out standard input/output/error descriptors */ -@@ -114,6 +117,7 @@ closeDescriptors(void) - - (void)closedir(dp); - -+#endif - return 1; // success - } - diff --git a/java/openjdk23/pkg-descr b/java/openjdk23/pkg-descr deleted file mode 100644 index b6e6b7ef9308..000000000000 --- a/java/openjdk23/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -FreeBSD port of OpenJDK 23 - -This version of the port passes basic smoke testing. It has been successfully -built on some combinations of FreeBSD 13 and 14 for the aarch64 and amd64 -architectures. - -Although these are untested, it may also build on other recent FreeBSD releases -for the x86 and powerpc64 architectures. diff --git a/java/openjdk23/pkg-message b/java/openjdk23/pkg-message deleted file mode 100644 index c072654ad070..000000000000 --- a/java/openjdk23/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ -[ -{ type: install - message: <<EOM -This OpenJDK implementation may require procfs(5) mounted on /proc. - -If you have not done it yet, please do the following: - - mount -t procfs proc /proc - -To make it permanent, you need the following lines in /etc/fstab: - - proc /proc procfs rw 0 0 -EOM -} -] |
