diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index ae32625b5908..1072d7492c32 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -1,182 +1,179 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel -PORTREVISION= 2 PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 ONLY_FOR_ARCHS= aarch64 amd64 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= jdk17 +GH_PROJECT= jdk17u 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/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 17 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 0 -JDK_BUILD_NUMBER= 35 +JDK_PATCH_VERSION= 1 +JDK_BUILD_NUMBER= 12 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 \ --disable-hotspot-gtest \ --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-zlib=system \ --with-lcms=system \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ --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} ALL_TARGET= images JDK_BUILD_TYPE= release .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 \ ${LOCALBASE}/openjdk16 # 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}/openjdk16 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16 .endif JDK_BUILD_JVM= server MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} .if ${COMPILER_TYPE} == gcc USE_GCC= yes CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/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 .if ${COMPILER_VERSION} >= 130 CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter" .endif .endif .if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-warnings-as-errors .endif .if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) CONFIGURE_ARGS+= --disable-dtrace .endif .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp .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 - ${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp \ - ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.hpp 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/openjdk17/distinfo b/java/openjdk17/distinfo index 74063d6d6290..1977a8232dc0 100644 --- a/java/openjdk17/distinfo +++ b/java/openjdk17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632003856 -SHA256 (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 7a4b9e8408de588ae19dbdf6ba0292ff672de77a4af4b42e31f271bacd796e72 -SIZE (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 104691774 +TIMESTAMP = 1635630441 +SHA256 (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = d57fc4f2127926e1079d119dbc779725b6f8a6099baeab3553955c23f565db85 +SIZE (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = 104757777 diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 11eaa6868f3e..65f66318255d 100644 --- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -1,20 +1,11 @@ --- 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 -@@ -435,7 +435,7 @@ - - ifeq ($(USE_EXTERNAL_HARFBUZZ), true) - LIBFONTMANAGER_EXTRA_SRC = -- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS) -+ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS) - else - LIBFONTMANAGER_EXTRA_SRC = libharfbuzz - @@ -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/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp index 870868e7690e..402f0f475bc3 100644 --- a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp @@ -1,19 +1,11 @@ --- src/hotspot/os/bsd/os_bsd.cpp.orig 2021-09-29 21:25:10 UTC +++ src/hotspot/os/bsd/os_bsd.cpp -@@ -58,6 +58,7 @@ - #include "runtime/thread.inline.hpp" - #include "runtime/threadCritical.hpp" - #include "runtime/timer.hpp" -+#include "runtime/vm_version.hpp" - #include "services/attachListener.hpp" - #include "services/memTracker.hpp" - #include "services/runtimeService.hpp" @@ -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/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp b/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp deleted file mode 100644 index 99ad5c17d8b8..000000000000 --- a/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/battleblow/jdk17/pull/1 - ---- src/hotspot/share/adlc/formsopt.cpp.orig 2021-07-23 23:38:59 UTC -+++ src/hotspot/share/adlc/formsopt.cpp -@@ -436,15 +436,20 @@ void AllocClass::output(FILE *fp) { // Write inf - //==============================Frame Handling================================= - //------------------------------FrameForm-------------------------------------- - FrameForm::FrameForm() { -+ _sync_stack_slots = NULL; -+ _inline_cache_reg = NULL; -+ _interpreter_frame_pointer_reg = NULL; -+ _cisc_spilling_operand_name = NULL; - _frame_pointer = NULL; - _c_frame_pointer = NULL; - _alignment = NULL; -+ _return_addr_loc = false; -+ _c_return_addr_loc = false; - _return_addr = NULL; - _c_return_addr = NULL; - _varargs_C_out_slots_killed = NULL; - _return_value = NULL; - _c_return_value = NULL; -- _interpreter_frame_pointer_reg = NULL; - } - - FrameForm::~FrameForm() {