From nobody Fri Dec 13 23:31:17 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 4Y95FK6Byrz5gJZG; Fri, 13 Dec 2024 23:31:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y95FK5f26z4s0M; Fri, 13 Dec 2024 23:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734132677; 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=z265ojdgk3y5nNNPcr3gLwaF9qqiXePXQ56ksDdHrL0=; b=hUkzyhm1S6zwObmASPMQuTZU6cb+N7/fGD8dIuR4sIelr16DJQbTsTdX/h54KaC3fvhhy7 ZLHAEoomEUSzR1hfpUw52UMMUq8fjfz62YkvqCOd8sn+bf+J7UCz0H6t4YC+UicH7joyS9 ybcK3WvJCey0H7gCXKxDX9IS6N02DnORJGrMhGrkVgQ9UUe9MNpX+4J8UrucCpjgTGFFFY S/EjhDUOTIBeDbU5z5/BR54UCwlPNiA8c+k+yby5i4PgwBuB3m1M6s0FqdWSPLOL8Uiykr 7reUexmaSSz+0QHENxcLMmg5jHxRWB+AxL/TGjQxQs0CcrUWDou7bbrNYPWQnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734132677; 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=z265ojdgk3y5nNNPcr3gLwaF9qqiXePXQ56ksDdHrL0=; b=HpBTMAzgarsWxBwvm/hLRCcJ369uELv+tEQJBcrtnZQl+wfanQInu5cRwfg+KXzgmbkxbJ cq1xfosfIJYS5jgKA8eaNGhWM2cyhn5Qbwj5ExFv1l9I3Ziaqf6v32TFmZHl9Zw+2pVUWt WDySu7uBFuLNn88H9qYiwwTp7TUf0ZNvC+VTxfG+kcSH5o9i4e0BlBg2190cGzg5F87Bhd FHo1PPKDRqBn+JWHAPXrHXSCt2QNg8w1YPIxWg+q96gXHfwBYPV7lIa/GuMfk3yM71t2re vhstcCC2V+1OChMt8jSsEUWIyN3odTQC+C9sCA2fXkyXd5BppjN0DwjERTvV/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734132677; a=rsa-sha256; cv=none; b=igMPVQ4vbB/IvVTxHmJpKGkMxWRNcvHRG1SLYFAS+Y4/TQfRe6ymbOk3IaxdK0GShIXQ04 8tsF7QP4OVWYYTT5SXMGCEYNv3HDGnGXZqSOiitNKNi0NgraMZf4KqLExR6BnV0SI2xLWj bId3Ayg2Sb1ikJG3r9+VbHIYtmboyub8AJP/H1uvBbPfm5TB8FAs3mutQ/GgMs2WPNLOFk LsZlNjY1ShiLh7rmgR9YpRape8a2ff1zb9mepf4vfCwizkNYm5N8b5TbmZDMX+Xzj1wYa9 6eb8Kh3X/hWQAnP9QL4u7XcbhilV9VhN9w7RUOVhH0iRuDyRfZOONnlakEn0LA== 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 4Y95FK5FmyzxpT; Fri, 13 Dec 2024 23:31:17 +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 4BDNVHAJ079103; Fri, 13 Dec 2024 23:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDNVHB3079100; Fri, 13 Dec 2024 23:31:17 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:31:17 GMT Message-Id: <202412132331.4BDNVHB3079100@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: 4dc6727cb525 - main - math/dgl: 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: 4dc6727cb525f1252c5483cf80a691fd5bbeb49d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dc6727cb525f1252c5483cf80a691fd5bbeb49d commit 4dc6727cb525f1252c5483cf80a691fd5bbeb49d Author: Dimitry Andric AuthorDate: 2024-11-24 16:52:16 +0000 Commit: Dimitry Andric CommitDate: 2024-12-13 23:26:16 +0000 math/dgl: 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/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:241:30: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 241 | index_ = value_.template Construct(std::forward(args)...); | ^ /wrkdirs/usr/ports/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:258:26: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 258 | if (!value_.template Assign(TypeTag{}, index_, std::forward(value))) { | ^ /wrkdirs/usr/ports/math/dgl/work/dgl-1.1.2/third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h:265:26: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 265 | if (!value_.template Assign(index_, std::forward(value))) { | ^ In all these cases, appending "<>" is enough to satisfy the constraint. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 PR: 282949 Approved by: maintainer timeout (2 weeks) MFH: 2024Q4 --- ...third__party_libnop_include_nop_types_variant.h | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h b/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h new file mode 100644 index 000000000000..004e29c616b6 --- /dev/null +++ b/math/dgl/files/patch-third__party_tensorpipe_third__party_libnop_include_nop_types_variant.h @@ -0,0 +1,28 @@ +--- third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h.orig 2020-07-24 02:13:02 UTC ++++ third_party/tensorpipe/third_party/libnop/include/nop/types/variant.h +@@ -238,7 +238,7 @@ class Variant { + // resulting type. + template + void Construct(Args&&... args) { +- index_ = value_.template Construct(std::forward(args)...); ++ index_ = value_.template Construct<>(std::forward(args)...); + } + void Construct(EmptyVariant) {} + +@@ -255,14 +255,14 @@ class Variant { + // multiple element types. + template + void Assign(TypeTag, U&& value) { +- if (!value_.template Assign(TypeTag{}, index_, std::forward(value))) { ++ if (!value_.template Assign<>(TypeTag{}, index_, std::forward(value))) { + Destruct(); + Construct(TypeTag{}, std::forward(value)); + } + } + template + void Assign(T&& value) { +- if (!value_.template Assign(index_, std::forward(value))) { ++ if (!value_.template Assign<>(index_, std::forward(value))) { + Destruct(); + Construct(std::forward(value)); + }