diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index b001e09e4d68..25c3ae414590 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,220 +1,219 @@ 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} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} WWW= https://openjdk.java.net/ LICENSE= GPLv2 ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ 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 \ 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 USE_LDCONFIG= ${INSTALLDIR}/lib/server CPE_VENDOR= oracle USE_GITHUB= yes GH_ACCOUNT= battleblow GH_PROJECT= jdk11u NO_CCACHE= yes _MAKE_JOBS= # MAKE_ENV= LANG="C" \ LC_ALL="C" \ CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ MAKEFLAGS="" JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${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= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 26 -JDK_BUILD_NUMBER= 4 +JDK_PATCH_VERSION= 27 +JDK_BUILD_NUMBER= 6 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 OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT= CUPS CUPS_CONFIGURE_ON= --with-cups=${LOCALBASE} CUPS_CONFIGURE_OFF= --with-cups-include=${WRKDIR}/cups-${CUPS_INC_VER} CUPS_BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups CUPS_INC_VER= 2.4.2 CUPS_DISTFILES_OFF= OpenPrinting-cups-v${CUPS_INC_VER}_GH0.tar.gz:cups 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 \ --disable-hotspot-gtest \ --with-jvm-features=shenandoahgc \ --with-alsa=${LOCALBASE} \ --with-extra-cflags="${CFLAGS}" \ --with-extra-cxxflags="${CXXFLAGS}" \ --with-extra-ldflags="${LDFLAGS}" \ --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-libpng=system \ --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 .if !${PORT_OPTIONS:MCUPS} MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} . if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) BOOTSTRAPJDKDIR= ${BJDK} . endif .endfor # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif .if ${ARCH} == powerpc CONFIGURE_ARGS+= --with-jvm-variants=zero JDK_BUILD_JVM= zero .else JDK_BUILD_JVM= server .endif 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 LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT} CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} CXXFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} CONFIGURE_ARGS+=--disable-precompiled-headers .else MAKE_ENV+= USE_CLANG=true .if ${ARCH:Mpowerpc64*} LLVM_VER= 12 BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif .endif .if ${ARCH} == aarch64 || ${ARCH:Marmv*} CONFIGURE_ARGS+= --disable-dtrace .endif .if ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-precompiled-headers .endif .if ${ARCH} != amd64 CONFIGURE_ARGS+= --enable-aot=no .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 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 diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index 9364fcc1531a..b91fc199405c 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1739510711 +TIMESTAMP = 1745123589 SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 -SHA256 (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = d9afdf9ad1ccab4262fcb64a2578d28b4e5e39fa5f0bbd7903542115c49fb7f3 -SIZE (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = 116707932 +SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f +SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083 diff --git a/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk b/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk deleted file mode 100644 index 65490ededb9d..000000000000 --- a/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk +++ /dev/null @@ -1,11 +0,0 @@ ---- make/hotspot/lib/CompileJvm.gmk.orig 2024-10-04 16:07:55.502680000 +0200 -+++ make/hotspot/lib/CompileJvm.gmk 2024-10-04 16:07:03.672629000 +0200 -@@ -109,7 +109,7 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isT - ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true) - JVM_EXCLUDE_PATTERNS += arm_64 - --else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, bsd-arm)), true) -+else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, arm)), true) - JVM_EXCLUDE_PATTERNS += arm_64 - - else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true) diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted file mode 100644 index d05e5b4ab266..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2025-01-10 18:09:55 UTC -+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp -@@ -432,18 +432,6 @@ extern "C" { - // Implementations of atomic operations not supported by processors. - // -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html - --#ifndef _LP64 --extern "C" { -- long long unsigned int __sync_val_compare_and_swap_8( -- volatile void *ptr, -- long long unsigned int oldval, -- long long unsigned int newval) { -- ShouldNotCallThis(); -- return 0; // silence compiler warnings -- } --}; --#endif // !_LP64 -- - #ifndef PRODUCT - void os::verify_stack_alignment() { - } diff --git a/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp b/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp deleted file mode 100644 index f6c770aee32b..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp +++ /dev/null @@ -1,30 +0,0 @@ -This patch fixes the following error: - -In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47: -In file included from /usr/include/sys/user.h:51: -In file included from /usr/include/vm/pmap.h:88: -In file included from /usr/include/machine/pmap.h:48: -In file included from /usr/include/sys/systm.h:46: -/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration - 185 | breakpoint(void) - | ^ -/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here - 31 | extern "C" void breakpoint(); - - - ---- src/hotspot/os/bsd/os_perf_bsd.cpp.orig 2024-11-08 11:24:38 UTC -+++ src/hotspot/os/bsd/os_perf_bsd.cpp -@@ -43,6 +43,12 @@ - * with the same name. - */ - #define _MACHINE_PCB_H_ -+ /* -+ * do not redefine breakpoint on armv7 -+ */ -+ #ifdef __arm__ -+ #define _MACHINE_CPUFUNC_H_ -+ #endif - #endif - #include - #endif diff --git a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h deleted file mode 100644 index d05cdfd57db2..000000000000 --- a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h +++ /dev/null @@ -1,25 +0,0 @@ -This patch fixes the following error: - -In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40: -In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30: -/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier - 79 | typedef int bool; - | ^ -/usr/include/stdbool.h:37:14: note: expanded from macro 'bool' - 37 | #define bool _Bool - - ---- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig 2024-10-07 16:02:52.117023000 +0200 -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h 2024-10-07 16:02:15.020023000 +0200 -@@ -76,9 +76,11 @@ typedef int bool; - - // This C bool type must be int for compatibility with BSD calls and - // it would be a mistake to equivalence it to C++ bool on many platforms -+#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined) - typedef int bool; - #define true 1 - #define false 0 -+#endif // __FreeBSD__ && !__bool_true_false_are_defined - - #endif // __APPLE__ - diff --git a/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h b/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h deleted file mode 100644 index b9e766070817..000000000000 --- a/java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jdk.pack/share/native/common-unpack/constants.h.orig 2024-07-27 15:11:22 UTC -+++ src/jdk.pack/share/native/common-unpack/constants.h -@@ -203,7 +203,7 @@ enum { - AO_HAVE_FIELD_FLAGS_HI = 1<<10, - AO_HAVE_METHOD_FLAGS_HI = 1<<11, - AO_HAVE_CODE_FLAGS_HI = 1<<12, -- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. -+ AO_UNUSED_MBZ = (~0u)<<13, // options bits reserved for future use. - - #define ARCHIVE_BIT_DO(F) \ - F(AO_HAVE_SPECIAL_FORMATS) \