From nobody Sun Oct 31 18:08:26 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 49AF01823066; Sun, 31 Oct 2021 18:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hj40W1fFwz4pkT; Sun, 31 Oct 2021 18:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14AAF225A5; Sun, 31 Oct 2021 18:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19VI8QC6073863; Sun, 31 Oct 2021 18:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19VI8QvE073862; Sun, 31 Oct 2021 18:08:26 GMT (envelope-from git) Date: Sun, 31 Oct 2021 18:08:26 GMT Message-Id: <202110311808.19VI8QvE073862@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: a9d52e329d39 - main - java/openjdk17: Update to 17.0.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9d52e329d39fb914170e582065f10f079eb4c5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9d52e329d39fb914170e582065f10f079eb4c5b commit a9d52e329d39fb914170e582065f10f079eb4c5b Author: Greg Lewis AuthorDate: 2021-10-31 17:59:31 +0000 Commit: Greg Lewis CommitDate: 2021-10-31 18:07:41 +0000 java/openjdk17: Update to 17.0.1 --- java/openjdk17/Makefile | 11 ++++----- java/openjdk17/distinfo | 6 ++--- ...ake_modules_java.desktop_lib_Awt2dLibraries.gmk | 9 -------- .../files/patch-src_hotspot_os_bsd_os__bsd.cpp | 8 ------- .../patch-src_hotspot_share_adlc_formsopt.cpp | 26 ---------------------- 5 files changed, 7 insertions(+), 53 deletions(-) diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index ae32625b5908..1072d7492c32 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -1,8 +1,7 @@ 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 @@ -34,7 +33,7 @@ CPE_VENDOR= oracle USE_GITHUB= yes GH_ACCOUNT= battleblow -GH_PROJECT= jdk17 +GH_PROJECT= jdk17u NO_CCACHE= yes @@ -58,8 +57,8 @@ 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 @@ -166,8 +165,6 @@ post-patch: -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} 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,14 +1,5 @@ --- 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, \ 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,13 +1,5 @@ --- 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" 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() {