From nobody Sat Sep 14 07:23:23 2024 X-Original-To: dev-commits-ports-main@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 4X5N241B1Dz5W3W2; Sat, 14 Sep 2024 07:23:24 +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 4X5N240BSXz4dgc; Sat, 14 Sep 2024 07:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726298604; 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=mdFRSh67duFKDjPLLIhs6tplo991lzyWHyhwMQlFlTM=; b=S0XKbpszMiTKEFUSVOfTgj06W5yg/SZaZuxHKzEyMVRVqZeYflfB+oRPR1FGykhb7EVJpf 3cjOyhqcmLFq/37b1sJypsIrhlP3uE+oePQ1fkYsKj/30Y5Ru2IVSBneqKbKovU6+thcre 2AOSW1Pgxm6UE+W5+MGaIWubwQWi8I6HZY4/PqVBWX4kWKwn+10r6G7M3XwIWO1WBk5cyx KNFfhu7fTj15/FaGh0Gje77gyuF9k/1kmLFA/AjGc2dW3dQ2ODmhqNLqnH16JkDC66YrV6 FsaOKRgAvagn8v1WOdKF3Fpf5H6EhXd+PMkXTWJRFivL7nr+izIKe9AJaAQhUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726298604; a=rsa-sha256; cv=none; b=ZAQO4jQUlTyCZceHaPHei1AQqRt2hCC4tGE+VJXrFLvcUseVPRFfp2yLqGXdqSLzBtoZyJ 9EirFDuAXry2/pWv0T4TVdysqEYXFLL2qfCJTk6HV75iqddpt01VkGYYXINAYQx9Ybptgb a0732PZVNXbQwz6OL58kOGMsr4vS8S4BTyetTNI/RHNVhC32KZe8JAGMDUZHA9W6ya3Vdx WCZT9vuoIjPUaSCtiRnfOvfiH1z1gtgvmlbdd/9bhQBWKlWyX4v47n1pnm8E4us2FHaEHz +eXps3gZQ67VZIiNywYLkKdZ/j9GhaEbD/ppzjxIpSkZeQcRygdeBIYX49Nixg== 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=1726298604; 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=mdFRSh67duFKDjPLLIhs6tplo991lzyWHyhwMQlFlTM=; b=ywX+dUoIyJrk4HBNEyDbtDwWFAgvMbP1nR7laDDoxclc0cczzd5oCCGgA4HIE1wRGukm/g ngCBM4nhkaVeJu42otLcE0krk5CjqwAG2iZxzD4pV8EZ3ZO/3KMjb8IqAyOAzeFa+WwGTy SrimzyfK+IQ2NUC4hsnqdBPStruGA3dihSUH6K2USoaQFwAtmDj/V74de22giy72Rnyf7L zA9gyjn4SpGFUqTi4xVjG00nk32oyKnRIEdd9U/0nGG94g7vsB3D6ulUF+sS0tmN5ssfHe zNapDcLD6VQYG4MTyB4ON5pqLLmZzn2zSGMCvuyugVibkhtG5K85quJhbyB30A== 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 4X5N236v8gzJBH; Sat, 14 Sep 2024 07:23:23 +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 48E7NN4Q014675; Sat, 14 Sep 2024 07:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48E7NNb4014672; Sat, 14 Sep 2024 07:23:23 GMT (envelope-from git) Date: Sat, 14 Sep 2024 07:23:23 GMT Message-Id: <202409140723.48E7NNb4014672@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: e34a77083e96 - main - devel/llvm13: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: e34a77083e96050812b4f082efc716dd16069c82 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=e34a77083e96050812b4f082efc716dd16069c82 commit e34a77083e96050812b4f082efc716dd16069c82 Author: Dimitry Andric AuthorDate: 2024-09-13 20:00:46 +0000 Commit: Dimitry Andric CommitDate: 2024-09-14 07:21:04 +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 --- 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 + } +