From nobody Wed Aug 3 02:27:32 2022 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 4LyG3S6wPGz4YJwP; Wed, 3 Aug 2022 02:27:32 +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 4LyG3S6QCSz3fZQ; Wed, 3 Aug 2022 02:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659493652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6OU/CiqCBx58btLn1FzkHEHTaIryI5ncPL90RIXPXuM=; b=vBcsb/uEaoE/0TZA74WKNRf/CGngDvDpmQdLLL9/hGG5hqwqTj3eCn1fAVJmWI7yM9YhQy kO6bMoMGBvFWg+eUTcueQQ+iYBylPcvBCRVwlg/Q7sT9oCZqh8gpvX9e+ZtEPHxuMMizme U3vdY9zXuoY0e3lcYOAOQSTZG86YkSaFotfQwF5M8sEtknQLVx7z40UV96a9FBJIiT6rD2 lK2E9H66WzQWaD5wlnoOOAyRPoIaDfa3SpOQyiLOX9XQqJgI0u+YkuiAqED6FzffUKh5la 8I3Sr/t710gP/zqZzkYJJjQpjCFZiPxe3KGqGlgdoWmQSGe8I8gi+vUTHXe/7g== 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 4LyG3S5QTyzbL9; Wed, 3 Aug 2022 02:27:32 +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 2732RWE8065266; Wed, 3 Aug 2022 02:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2732RWBX065265; Wed, 3 Aug 2022 02:27:32 GMT (envelope-from git) Date: Wed, 3 Aug 2022 02:27:32 GMT Message-Id: <202208030227.2732RWBX065265@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: 28b0ae0fe75e - main - java/openjdk18: Update to 18.0.2 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: 28b0ae0fe75ee2f922efdb853faa2ce735002546 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659493652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6OU/CiqCBx58btLn1FzkHEHTaIryI5ncPL90RIXPXuM=; b=CedhG/jTFB7PDap8h/xxEtZwFXUb6YePfWfN9/V51W53WCZhMpGNNrIYO5GJvlgjhRscPc dtJHQoiFU4I6fi4QXlPmwJPDM8ptfUiw8rttTwXvlkbOjROpd6L+OkE0EqCFJlVOCp4ypN iZlTvthuHlZs8XyK0A7MlkKM9/IKPeoOyJ5a0r0FQ7bawjU82e+HimrmicebYMT2hoH6tB vfXnxJJXm2ZZPzCMqzjAaWmD8FYBe/9lhfnUfyLFoRUPuNvE7T7tDvfQeV4u1QmP04F5J9 XeZ1bpdT+TnJKqWV3hsyUTnyzy6VC+BTsXv6TODDQ1+RwbTfxSHm6pypNBCHnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659493652; a=rsa-sha256; cv=none; b=vl3z96IuL0v8EYKMZ9D9VkhEd64g83l9uFnW4lYW8el+B48GfHKpa5XKFU8o9VQimdwmiK QWdwwonBNRfDTY2of/n1puiQMRAHvODiJm6w2Sx6ynXVjJaakcSUqvj/1dqpVpVYydrYO0 WfMkFQtD8zC2kgknNAKq/19VQn6dABkQnnFQjFf/xVIk5lGUJxLRvxTi5Ja4BiI7MDoEso yHZ0AgIyzytnOQsALBBV/9G11s7/PClspC10fvaPSG2sb/4IjvAc0JpskSyBqmx7C1WV0S ojVRi3AFOmE8Y59hU7goqWb28fSjQCZj/7+nxyTgWPNRzkgsxMVLHqmlJR1BFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=28b0ae0fe75ee2f922efdb853faa2ce735002546 commit 28b0ae0fe75ee2f922efdb853faa2ce735002546 Author: Greg Lewis AuthorDate: 2022-08-03 02:19:45 +0000 Commit: Greg Lewis CommitDate: 2022-08-03 02:27:22 +0000 java/openjdk18: Update to 18.0.2 --- java/openjdk18/Makefile | 4 +-- java/openjdk18/distinfo | 6 ++-- ...t_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp | 38 ---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile index a917e99c2dfe..a5873a76259e 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -61,8 +61,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 18 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 1 -JDK_BUILD_NUMBER= 10 +JDK_PATCH_VERSION= 2 +JDK_BUILD_NUMBER= 9 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 diff --git a/java/openjdk18/distinfo b/java/openjdk18/distinfo index c7f3db070142..69499290784a 100644 --- a/java/openjdk18/distinfo +++ b/java/openjdk18/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651718961 -SHA256 (battleblow-jdk18u-jdk-18.0.1+10-1_GH0.tar.gz) = 3c95f7d8cad401ea03e60b0f4f952509b3528f98007603f167cf306d19204832 -SIZE (battleblow-jdk18u-jdk-18.0.1+10-1_GH0.tar.gz) = 105555943 +TIMESTAMP = 1659446153 +SHA256 (battleblow-jdk18u-jdk-18.0.2+9-1_GH0.tar.gz) = ad941ee9407015986f26cd7c6be60fb460d87ab7b87c7cbfe75e6f31711be501 +SIZE (battleblow-jdk18u-jdk-18.0.2+9-1_GH0.tar.gz) = 105593810 diff --git a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp deleted file mode 100644 index a71932f53fe2..000000000000 --- a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp -+++ src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp -@@ -184,9 +184,14 @@ inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value, - atomic_memory_order order) const { - STATIC_ASSERT(4 == sizeof(I)); - STATIC_ASSERT(4 == sizeof(D)); -- D old_value -- = atomic_fastcall(aarch64_atomic_fetch_add_4_impl, dest, add_value); -- return old_value; -+ aarch64_atomic_stub_t stub; -+ switch (order) { -+ case memory_order_relaxed: -+ stub = aarch64_atomic_fetch_add_4_relaxed_impl; break; -+ default: -+ stub = aarch64_atomic_fetch_add_4_impl; break; -+ } -+ return atomic_fastcall(stub, dest, add_value); - } - - template<> -@@ -195,9 +200,14 @@ inline D Atomic::PlatformAdd<8>::fetch_and_add(D volatile* dest, I add_value, - atomic_memory_order order) const { - STATIC_ASSERT(8 == sizeof(I)); - STATIC_ASSERT(8 == sizeof(D)); -- D old_value -- = atomic_fastcall(aarch64_atomic_fetch_add_8_impl, dest, add_value); -- return old_value; -+ aarch64_atomic_stub_t stub; -+ switch (order) { -+ case memory_order_relaxed: -+ stub = aarch64_atomic_fetch_add_8_relaxed_impl; break; -+ default: -+ stub = aarch64_atomic_fetch_add_8_impl; break; -+ } -+ return atomic_fastcall(stub, dest, add_value); - } - - template<>