diff options
Diffstat (limited to 'java')
18 files changed, 0 insertions, 736 deletions
diff --git a/java/Makefile b/java/Makefile index a8432608722d..766accebdd6b 100644 --- a/java/Makefile +++ b/java/Makefile @@ -81,7 +81,6 @@ SUBDIR += openjdk11-jre SUBDIR += openjdk17 SUBDIR += openjdk17-jre - SUBDIR += openjdk19 SUBDIR += openjdk20 SUBDIR += openjdk21 SUBDIR += openjdk21-jre diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile deleted file mode 100644 index 1c1ca5ef2143..000000000000 --- a/java/openjdk19/Makefile +++ /dev/null @@ -1,184 +0,0 @@ -PORTNAME= openjdk -DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 6 -CATEGORIES= java devel -PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -MASTER_SITES= LOCAL/openjdk/:boot - -MAINTAINER= java@FreeBSD.org -COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} -WWW= https://openjdk.java.net/projects/jdk/19/ - -LICENSE= GPLv2 - -DEPRECATED= No longer supported by upstream -EXPIRATION_DATE= 2026-02-12 - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le - -BUILD_DEPENDS= zip:archivers/zip \ - autoconf>0:devel/autoconf \ - ${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= 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= battleblow -GH_PROJECT= jdk19u - -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" \ - CLASSPATH="" \ - JAVA_HOME="" \ - LD_LIBRARY_PATH="" \ - CC=${CC} \ - CXX=${CXX} \ - CPP=${CPP} \ - LOG=cmdlines \ - MAKEFLAGS="" - -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} -.if defined(BUILD_JRE) -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre -.else -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk -.endif -INSTALLDIR= ${PREFIX}/${PKGBASE} - -NOPRECIOUSMAKEVARS= yes - -JDK_MAJOR_VERSION= 19 -JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 2 -JDK_BUILD_NUMBER= 7 -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 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CC=${CC} \ - CXX=${CXX} \ - CPP=${CPP} \ - 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-freetype-include=${LOCALBASE}/include/freetype2 \ - --with-freetype-lib=${LOCALBASE}/lib \ - --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> - -# Set up bootstrap JDK -BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk -BOOTSTRAPJDKFILE= openjdk19-19.0.2+7.1_4.${JDK_ARCH}.tar.xz -DISTFILES+= ${BOOTSTRAPJDKFILE}:boot - -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" -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_share_runtime_arguments.cpp -.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: - @${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 - -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/openjdk19/distinfo b/java/openjdk19/distinfo deleted file mode 100644 index eb9b9733698b..000000000000 --- a/java/openjdk19/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -TIMESTAMP = 1767964712 -SHA256 (openjdk19-19.0.2+7.1_4.aarch64.tar.xz) = 7814d7246544e3c5473f365fd2715b66d0edfd282718729570a3a89af367309d -SIZE (openjdk19-19.0.2+7.1_4.aarch64.tar.xz) = 165535772 -SHA256 (openjdk19-19.0.2+7.1_4.ppc64.tar.xz) = fd061aa055fe595f2f40881613ea85b764e36bf290513fc90f533c5ade05119d -SIZE (openjdk19-19.0.2+7.1_4.ppc64.tar.xz) = 164440176 -SHA256 (openjdk19-19.0.2+7.1_4.ppc64le.tar.xz) = 621ca906d2f055110aa5c187ca510a777a026bc2193ce66573960d0818017e83 -SIZE (openjdk19-19.0.2+7.1_4.ppc64le.tar.xz) = 165364276 -SHA256 (openjdk19-19.0.2+7.1_4.x86.tar.xz) = 4f66ff4084920ff17c76627023b1a7a065f58a2251bd5d7f931db548b6d5283e -SIZE (openjdk19-19.0.2+7.1_4.x86.tar.xz) = 161195988 -SHA256 (openjdk19-19.0.2+7.1_4.x86_64.tar.xz) = 762c8f78476eeb7d4a303bc47b77b52caf28adff95216efa840bd3427c34f5fc -SIZE (openjdk19-19.0.2+7.1_4.x86_64.tar.xz) = 167284224 -SHA256 (battleblow-jdk19u-jdk-19.0.2+7-1_GH0.tar.gz) = de51e43632d34421941e8c18c0364a5231e6c4b3999e7c8cb42bbdb029776a66 -SIZE (battleblow-jdk19u-jdk-19.0.2+7-1_GH0.tar.gz) = 108286775 diff --git a/java/openjdk19/files/extra-patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk19/files/extra-patch-src_hotspot_share_runtime_arguments.cpp deleted file mode 100644 index 80ef25c560f6..000000000000 --- a/java/openjdk19/files/extra-patch-src_hotspot_share_runtime_arguments.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/hotspot/share/runtime/arguments.cpp.orig 2023-01-15 10:13:55.469227000 -0800 -+++ src/hotspot/share/runtime/arguments.cpp 2023-01-15 10:20:49.218102000 -0800 -@@ -1557,6 +1557,10 @@ - // set_use_compressed_oops(). - void Arguments::set_use_compressed_klass_ptrs() { - #ifdef _LP64 -+# if defined(__FreeBSD__) && defined(AARCH64) -+ FLAG_SET_DEFAULT(UseCompressedClassPointers, false); -+ FLAG_SET_ERGO(UseCompressedClassPointers, false); -+# else - // On some architectures, the use of UseCompressedClassPointers implies the use of - // UseCompressedOops. The reason is that the rheap_base register of said platforms - // is reused to perform some optimized spilling, in order to use rheap_base as a -@@ -1582,6 +1586,7 @@ - } - } - } -+# endif // __FreeBSD__ && AARCH64 - #endif // _LP64 - } - diff --git a/java/openjdk19/files/patch-configure b/java/openjdk19/files/patch-configure deleted file mode 100644 index 59daa4ff854f..000000000000 --- a/java/openjdk19/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, 2014, 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/openjdk19/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk19/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk19/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/openjdk19/files/patch-make_autoconf_help.m4 b/java/openjdk19/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk19/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/openjdk19/files/patch-make_autoconf_libraries.m4 b/java/openjdk19/files/patch-make_autoconf_libraries.m4 deleted file mode 100644 index 0911464a6522..000000000000 --- a/java/openjdk19/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/openjdk19/files/patch-make_hotspot_lib_JvmMapfile.gmk b/java/openjdk19/files/patch-make_hotspot_lib_JvmMapfile.gmk deleted file mode 100644 index 9ae03810886e..000000000000 --- a/java/openjdk19/files/patch-make_hotspot_lib_JvmMapfile.gmk +++ /dev/null @@ -1,20 +0,0 @@ ---- make/hotspot/lib/JvmMapfile.gmk.orig 2022-07-20 22:54:48 UTC -+++ make/hotspot/lib/JvmMapfile.gmk -@@ -53,7 +53,7 @@ ifeq ($(call isTargetOs, linux), true) - # platform dependent. - - ifeq ($(call isTargetOs, linux), true) -- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o -+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o - ifneq ($(FILTER_SYMBOLS_PATTERN), ) - FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| - endif -@@ -134,7 +134,7 @@ else ifeq ($(call isTargetOs, bsd), true) - if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \ - }' - else -- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o -+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o - FILTER_SYMBOLS_AWK_SCRIPT := \ - '{ \ - if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \ diff --git a/java/openjdk19/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk19/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk deleted file mode 100644 index 65f66318255d..000000000000 --- a/java/openjdk19/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ /dev/null @@ -1,11 +0,0 @@ ---- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700 -+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700 -@@ -530,7 +530,7 @@ - LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_aix := -Wl$(COMMA)-berok, \ - LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ -- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ -+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ - LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ - $(WIN_AWT_LIB), \ diff --git a/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index d3b0e0b9821e..000000000000 --- a/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2022-12-21 16:54:47 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -187,16 +187,6 @@ frame os::current_frame() { - bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, - ucontext_t* uc, JavaThread* thread) { - -- // Moved SafeFetch32 handling outside thread!=NULL conditional block to make -- // it work if no associated JavaThread object exists. -- if (uc) { -- address const pc = os::Posix::ucontext_get_pc(uc); -- if (pc && StubRoutines::is_safefetch_fault(pc)) { -- os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc)); -- return true; -- } -- } -- - // decide if this trap can be handled by a stub - address stub = NULL; - address pc = NULL; diff --git a/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__x86_safefetch__bsd__x86__32.S b/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__x86_safefetch__bsd__x86__32.S deleted file mode 100644 index 67d37e025d57..000000000000 --- a/java/openjdk19/files/patch-src_hotspot_os__cpu_bsd__x86_safefetch__bsd__x86__32.S +++ /dev/null @@ -1,46 +0,0 @@ ---- /dev/null -+++ src/hotspot/os_cpu/bsd_x86/safefetch_bsd_x86_32.S -@@ -0,0 +1,43 @@ -+# -+# Copyright (c) 2022 SAP SE. All rights reserved. -+# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ .globl SafeFetch32_impl -+ .globl _SafeFetch32_fault -+ .globl _SafeFetch32_continuation -+ -+ .text -+ -+ # Support for int SafeFetch32(int* address, int defaultval); -+ # -+ # 8(%esp) : default value -+ # 4(%esp) : crash address -+ # 0(%esp) : return pc -+ .type _SafeFetch32_impl,@function -+SafeFetch32_impl: -+ movl 4(%esp),%ecx # load address from stack -+_SafeFetch32_fault: -+ movl (%ecx), %eax # load target value, may fault -+ ret -+_SafeFetch32_continuation: -+ movl 8(%esp),%eax # load default value from stack -+ ret diff --git a/java/openjdk19/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk19/files/patch-src_hotspot_os_bsd_os__bsd.cpp deleted file mode 100644 index 402f0f475bc3..000000000000 --- a/java/openjdk19/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/openjdk19/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk19/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c deleted file mode 100644 index 537ecdc3047c..000000000000 --- a/java/openjdk19/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c +++ /dev/null @@ -1,209 +0,0 @@ ---- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC -+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c -@@ -43,6 +43,7 @@ - #include FT_SYNTHESIS_H - #include FT_LCD_FILTER_H - #include FT_MODULE_H -+#include <fontconfig/fontconfig.h> - - #include "fontscaler.h" - -@@ -87,6 +88,133 @@ typedef struct FTScalerContext { - int ptsz; /* size in points */ - } FTScalerContext; - -+typedef struct { -+ FT_Render_Mode ftRenderMode; -+ int ftLoadFlags; -+ FT_LcdFilter ftLcdFilter; -+} RenderingProperties; -+ -+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) { -+ FcPattern* pattern = FcPatternCreate(); -+ if (!pattern) -+ return 0; -+ -+ FcPatternAddString(pattern, FC_FAMILY, family); -+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue); -+ FcPatternAddDouble(pattern, FC_SIZE, ptSize); -+ -+ FcConfigSubstitute(0, pattern, FcMatchPattern); -+ FcDefaultSubstitute(pattern); -+ -+ FcResult res; -+ FcPattern *match = FcFontMatch(0, pattern, &res); -+ FcPatternDestroy(pattern); -+ return (res == FcResultMatch) ? match : NULL; -+} -+ -+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) { -+ FcPattern *pattern = matchedPattern(family, ptSize); -+ -+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL; -+ int ftLoadFlags = FT_LOAD_DEFAULT; -+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ FcBool fcAntialias = 0; -+ char horizontal = 1; -+ -+ // subpixel order -+ if (aaType == TEXT_AA_ON) -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ else if (aaType == TEXT_AA_OFF) -+ ftRenderMode = FT_RENDER_MODE_MONO; -+ else { -+ int fcRGBA = FC_RGBA_UNKNOWN; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA); -+ switch (fcRGBA) { -+ case FC_RGBA_NONE: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ case FC_RGBA_RGB: -+ case FC_RGBA_BGR: -+ ftRenderMode = FT_RENDER_MODE_LCD; -+ horizontal = 1; -+ break; -+ case FC_RGBA_VRGB: -+ case FC_RGBA_VBGR: -+ ftRenderMode = FT_RENDER_MODE_LCD_V; -+ horizontal = 0; -+ break; -+ default: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ } -+ } -+ -+ // loading mode -+ if (aaType == TEXT_AA_OFF) -+ ftLoadFlags |= FT_LOAD_TARGET_MONO; -+ else { -+ int fcHintStyle = FC_HINT_NONE; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle); -+ switch (fcHintStyle) { -+ case FC_HINT_NONE: -+ ftLoadFlags |= FT_LOAD_NO_HINTING; -+ break; -+ case FC_HINT_SLIGHT: -+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT; -+ break; -+ case FC_HINT_MEDIUM: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ case FC_HINT_FULL: -+ if (aaType == TEXT_AA_ON) -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ else -+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V; -+ break; -+ default: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ } -+ } -+ -+ // autohinting -+ FcBool fcAutohint = 0; -+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch) -+ if (fcAutohint) -+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT; -+ -+ // LCD filter -+ int fcLCDFilter = FC_LCD_DEFAULT; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter); -+ switch (fcLCDFilter) { -+ case FC_LCD_NONE: -+ ftLcdFilter = FT_LCD_FILTER_NONE; -+ break; -+ case FC_LCD_DEFAULT: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ case FC_LCD_LIGHT: -+ ftLcdFilter = FT_LCD_FILTER_LIGHT; -+ break; -+ case FC_LCD_LEGACY: -+ ftLcdFilter = FT_LCD_FILTER_LEGACY; -+ break; -+ default: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ } -+ -+ if (pattern) -+ FcPatternDestroy(pattern); -+ -+ rp->ftRenderMode = ftRenderMode; -+ rp->ftLoadFlags = ftLoadFlags; -+ rp->ftLcdFilter = ftLcdFilter; -+} -+ - #ifdef DEBUG - /* These are referenced in the freetype sources if DEBUG macro is defined. - To simplify work with debuging version of freetype we define -@@ -868,29 +996,12 @@ static jlong - renderFlags |= FT_LOAD_NO_HINTING; - } - -- if (!context->useSbits) { -- renderFlags |= FT_LOAD_NO_BITMAP; -- } -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- /* NB: in case of non identity transform -- we might also prefer to disable transform before hinting, -- and apply it explicitly after hinting is performed. -- Or we can disable hinting. */ -- -- /* select appropriate hinting mode */ -- if (context->aaType == TEXT_AA_OFF) { -- target = FT_LOAD_TARGET_MONO; -- } else if (context->aaType == TEXT_AA_ON) { -- target = FT_LOAD_TARGET_NORMAL; -- } else if (context->aaType == TEXT_AA_LCD_HRGB || -- context->aaType == TEXT_AA_LCD_HBGR) { -- target = FT_LOAD_TARGET_LCD; -- } else { -- target = FT_LOAD_TARGET_LCD_V; -- } -- renderFlags |= target; -- -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - //do not destroy scaler yet. - //this can be problem of particular context (e.g. with bad transform) -@@ -915,11 +1026,11 @@ static jlong - glyphInfo = getNullGlyphImage(); - return ptr_to_jlong(glyphInfo); - } -- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); -- if (error != 0) { -- return ptr_to_jlong(getNullGlyphImage()); -- } - } -+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode); -+ if (error != 0) { -+ return ptr_to_jlong(getNullGlyphImage()); -+ } - - if (renderImage) { - width = (UInt16) ftglyph->bitmap.width; -@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f - return NULL; - } - -- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - return NULL; - } diff --git a/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp b/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp deleted file mode 100644 index 30a55e7d9a9e..000000000000 --- a/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp +++ /dev/null @@ -1,42 +0,0 @@ ---- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-10-20 06:58:23.018695000 -0700 -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-12-29 13:13:27.000625000 -0800 -@@ -35,7 +35,11 @@ - #define amd64 1 - #endif - --#ifdef i386 -+#if defined(i386) && !defined(i586) -+#define i586 1 -+#endif -+ -+#ifdef i586 - #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" - #endif - -@@ -347,7 +351,7 @@ - } - - #undef NPRGREG --#ifdef i386 -+#ifdef i586 - #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG - #endif - #ifdef amd64 -@@ -369,7 +373,7 @@ - - #undef REG_INDEX - --#ifdef i386 -+#ifdef i586 - #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg - - regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs; -@@ -388,7 +392,7 @@ - regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs; - regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss; - --#endif /* i386 */ -+#endif /* i586 */ - - #ifdef amd64 - #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg diff --git a/java/openjdk19/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk19/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c deleted file mode 100644 index 0e4c9e8aa76a..000000000000 --- a/java/openjdk19/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 2022-07-20 22:54:48 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 - -@@ -178,23 +179,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 */ - /* -@@ -404,6 +425,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; diff --git a/java/openjdk19/pkg-descr b/java/openjdk19/pkg-descr deleted file mode 100644 index bbc3e1c1edc7..000000000000 --- a/java/openjdk19/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -An open-source implementation of the Java Platform, Standard Edition, diff --git a/java/openjdk19/pkg-message b/java/openjdk19/pkg-message deleted file mode 100644 index 811dcb1e3b58..000000000000 --- a/java/openjdk19/pkg-message +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ type: install - message: <<EOM -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 procfs proc /proc - -To make it permanent, you need the following lines in /etc/fstab: - - proc /proc procfs rw 0 0 -EOM -} -] |