From nobody Sat Sep 14 07:25:35 2024 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 4X5N4b5Jc6z5W3xR; Sat, 14 Sep 2024 07:25:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X5N4b3l1lz4dly; Sat, 14 Sep 2024 07:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726298735; 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=J+LNLczWmBeFhn1mOZolBcB1kTV2H6AxZq45y7LtLuw=; b=WHoavXiRnYd1pT9skcf4dDySeAuIf80QCrZNAfrgx1BjVxcZmxTWoLRznXzBOj+qXBAd7e S4v3inUoTfdGYVknZWvz+J1ZYTwvLXFGhkvfjJ5RhcpxJ60jtlgQwAaCQ4wNcWgGAkjDZ3 88x6Sy4lYbT4njUR/uuT+9NzqEY70dAANeTs9ClqDN72h44YhW30HJZoEylbE5wEwqHVAJ aJrnnJcP/rYB+HtB6NlKnNXPt27gIsBQ1o/Fzk3vWM0MR9cAEm9DqTBuJv0CGfVJxh+jpF d8oUFXS2f09YjPnPNv1kNo8uZmky0I4wrenNsUefg/pz2tD3aUaR7keeDyjygw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726298735; a=rsa-sha256; cv=none; b=AaBcdr5zrNv3r6NCnXJlbfOxKY0oyLv7gR6VaByeOojaMYwFvtRMv9GVefIiKwggIhx4W4 JkaDHCwAG2bYqO/eeBB5LjYVmW17T+ORFnzW/+g0NtL8jby1EXSY0WzdDYqefEw05kDf0O 167HCggF7fe+wcpzl4u6FEBvStvaFFc4ZKUzR/TQ00DHWSrPNk68zEI+4+dANSdlZjupdT ZPqAg8st0bckgNGrP46y9H5sH3qHnw5vgTet62j4ZX6iDa2XnK00okE8PG7i+QHq0UcqR6 aJ3qI9EnCuC8To6m8nJECaASgh5M8/w2kB+PA9eWJO6Nh5gAFbO4D7Jp2CgszA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726298735; 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=J+LNLczWmBeFhn1mOZolBcB1kTV2H6AxZq45y7LtLuw=; b=qjVoECKnIJ+SHCgswj+tVBoqQhfeo3rmrpqfWJLEqJOUohdw4dhvoX2xwByntxRIQCe3c8 PX5qZA12+alMsg6ATqFngWSI00KDIZgdxqpOhR5uuJws7zGvs0iAXqtG4PGAxuMQqZsaxS srjIOJEMzC7mevYC30dfyHONCxmbuOHzQROzsgmjdPZNLv4ZZsBs8QqlWJ7avuwsExl0Ou VFktC+vUkTENvSspA7kD+L7ju7pR2MURZ0UfnSoGWu+ct3tGdZOE0WK78HcK6yCw2TDYDT GNiBIIs9M7tr65HfW/sOe/lv6n6KOs2s/iranC5c0Ie2AkyG7soslt30UYSrsQ== 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 4X5N4b2KPwzJBL; Sat, 14 Sep 2024 07:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48E7PZGg015168; Sat, 14 Sep 2024 07:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48E7PZg5015165; Sat, 14 Sep 2024 07:25:35 GMT (envelope-from git) Date: Sat, 14 Sep 2024 07:25:35 GMT Message-Id: <202409140725.48E7PZg5015165@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: b3ef9c3fc266 - 2024Q3 - devel/llvm13: fix build with clang 19 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: b3ef9c3fc26694ff56749fcdb04cee2af2567f06 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3ef9c3fc26694ff56749fcdb04cee2af2567f06 commit b3ef9c3fc26694ff56749fcdb04cee2af2567f06 Author: Dimitry Andric AuthorDate: 2024-09-13 20:00:46 +0000 Commit: Dimitry Andric CommitDate: 2024-09-14 07:25:06 +0000 devel/llvm13: fix build with clang 19 Clang 19 now implements CWG 96 [1], which requires a template argument list after a 'template' keyword, resulting in errors similar to: /wrkdirs/usr/ports/devel/llvm13/work/llvm-project-13.0.1.src/flang/include/flang/Evaluate/integer.h:310:32: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 310 | auto back{FROM::template ConvertSigned(result.value)}; | ^ Upstream has committed a fix to their main branch [2], but it does not apply cleanly to 13.0.1, so add a backported patch. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 [2] https://github.com/llvm/llvm-project/commit/7bc7672925f8154be3b8220365d3f269ac43621c PR: 281486 Approved by: brooks (maintainer) MFH: 2024Q3 (cherry picked from commit e34a77083e96050812b4f082efc716dd16069c82) --- devel/llvm13/files/patch-backport-7bc7672925 | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/devel/llvm13/files/patch-backport-7bc7672925 b/devel/llvm13/files/patch-backport-7bc7672925 new file mode 100644 index 000000000000..6778cb80991a --- /dev/null +++ b/devel/llvm13/files/patch-backport-7bc7672925 @@ -0,0 +1,61 @@ +From 7bc7672925f8154be3b8220365d3f269ac43621c Mon Sep 17 00:00:00 2001 +From: David Spickett +Date: Mon, 3 Jun 2024 15:21:26 +0100 +Subject: [PATCH] [flang] Fix compilation errors due to new clang template + requirements (#94204) + +Since https://github.com/llvm/llvm-project/pull/80801 clang requires a +template argument list after the use of the template keyword. + +https://lab.llvm.org/buildbot/#/builders/176/builds/10230 + +error: a template argument list is expected after a name prefixed by the +template keyword [-Wmissing-template-arg-list-after-template-kw] + +This fixes the instances found by the AArch64 Linux builds. +--- + flang/include/flang/Evaluate/integer.h | 2 +- + flang/lib/Evaluate/fold-real.cpp | 7 ++++--- + flang/runtime/reduction-templates.h | 8 ++++---- + 3 files changed, 9 insertions(+), 8 deletions(-) + +--- flang/include/flang/Evaluate/integer.h.orig 2022-06-22 16:46:24 UTC ++++ flang/include/flang/Evaluate/integer.h +@@ -307,7 +307,7 @@ class Integer { (public) + } + result.overflow = false; + } else if constexpr (bits < FROM::bits) { +- auto back{FROM::template ConvertSigned(result.value)}; ++ auto back{FROM::template ConvertSigned(result.value)}; + result.overflow = back.value.CompareUnsigned(that) != Ordering::Equal; + } + return result; +--- flang/runtime/reduction-templates.h.orig 2022-06-22 16:46:24 UTC ++++ flang/runtime/reduction-templates.h +@@ -86,7 +86,7 @@ inline CppTypeFor GetTotalReduction(const D + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(&result); + #else +- accumulator.template GetResult(&result); ++ accumulator.template GetResult(&result); + #endif + return result; + } +@@ -127,7 +127,7 @@ inline void ReduceDimToScalar(const Descriptor &x, int + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } + +@@ -155,7 +155,7 @@ inline void ReduceDimMaskToScalar(const Descriptor &x, + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } +