From nobody Sun Sep 08 17:48:53 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 4X1yBZ01fvz5VYgj; Sun, 08 Sep 2024 17:48:54 +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 4X1yBY6bPDz4hd0; Sun, 8 Sep 2024 17:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725817733; 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=jKubwYerGywrKm7ooN/99RB0X4KSfWYpYpn5eMhRQIs=; b=SOEDAvsF3jBccPPosEJFUbIDB5MIuswWYc8gb0H34YWuI79xcs5Pbhk95DqjjH1YLf3Boe E9B0udJTtgje5Qe5b37e3R9MFz4lktdSPFbM2kq05cf9rKF3oaYDgZiU2j8RVp8mQkjAvf 7fMq/3iJO9AJ3XMNtLvifMYP698Rt1Fk5Kl6KKVbsyyZIc04FiOYT/CUKKZ3eP3LFrDdai uSANT2R+bUfq94pn6BQZ+yKNAOq2j4Rw8YZ4Ln28uYMH80gfOMQAU3nfDM5LomT/jtUkQb 1VSv37woBDNtcG33t6BJXVOTIH23PkXltqDR9zu8KHGrJRSkNJyE0ltAanlMvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725817733; a=rsa-sha256; cv=none; b=s2QBdVV8g6iWf3+UzyyDoHgI6u5sATB0/AXilGLe1AhiWz47AxTvCovrI1BLXsTjbiBFnh pbWsk5VK41YUT60OVRhRqxcOKiWvWWg5HF5HADRZY04aYbazI7/6uavCfqBsrGUMjK7jZP J+Jkyk/g3y40FNnR3o3bgbyUHerFeL+NKYQIwaXpD6lrOmWw8GZdAvJlwQwkN3wjqsRzTc 61powLYP+B7uZTqe324oP/2K7fX/nuQh0+TRaOOxwq+hINiOAT4Q/XtLYRd0rMaUCuq/wE mRXUA+ZjeCoI79TqXoLvQgN2fcpNP/MCFpjfBvdZJzfWeA6kZUqrsy/e++guow== 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=1725817733; 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=jKubwYerGywrKm7ooN/99RB0X4KSfWYpYpn5eMhRQIs=; b=mjLaUQGQI3jI9IE02Lm1XfgS1hHZtKSsTVbuqbSZIdflZ9e2MXxUphIkt0GNHMx3IVJOtZ gMeJ+E6n+aHj5vLsQhQ2hpcnDUsCtO/o7FFqb1Kbbw6DARtT10leWGi1F8yoWFyMoit0Io fVEgAh4doN+zYxQ/RJOY3c8+oyVQU+fivautn6SpAk7W3ICaEAuQbM/RoNvs6P+qtrfO+5 5z2MEIJAQ155kBOt59FremzZY2rNgNntauMu8Ms0cZBNsFt6x1qWJujtsAWHK+DaPq8kGd ST8C0czVG8NhzJtZlZQhCFVp+y2IA88yk0EMRQut2/8I277A3opjYkGxT9DfGw== 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 4X1yBY6BqMzRkm; Sun, 8 Sep 2024 17:48:53 +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 488Hmrrx026333; Sun, 8 Sep 2024 17:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488HmrQU026330; Sun, 8 Sep 2024 17:48:53 GMT (envelope-from git) Date: Sun, 8 Sep 2024 17:48:53 GMT Message-Id: <202409081748.488HmrQU026330@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: 66edcb86f651 - 2024Q3 - devel/opentelemetry-cpp: 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: 66edcb86f65117393297fedb6a5e661f9e3db735 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=66edcb86f65117393297fedb6a5e661f9e3db735 commit 66edcb86f65117393297fedb6a5e661f9e3db735 Author: Dimitry Andric AuthorDate: 2024-09-08 09:20:21 +0000 Commit: Dimitry Andric CommitDate: 2024-09-08 17:48:08 +0000 devel/opentelemetry-cpp: 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/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/logger_type_traits.h:169:69: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 169 | return LogRecordSetterTrait::template Set( | ^ /wrkdirs/usr/ports/devel/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/logger.h:76:89: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 76 | detail::LogRecordSetterTrait::type>::template Set( | ^ /wrkdirs/usr/ports/devel/opentelemetry-cpp/work/opentelemetry-cpp-1.16.1/api/include/opentelemetry/logs/event_logger.h:69:89: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 69 | detail::LogRecordSetterTrait::type>::template Set( | ^ In these cases, appending "<>" is enough to satisfy the constraint. PR: 281359 Approved by: osa (maintainer) MFH: 2024Q3 (cherry picked from commit 676864fd474bdd6ec1d74496d0a58d9a5a046601) --- .../patch-api_include_opentelemetry_logs_event__logger.h | 11 +++++++++++ .../files/patch-api_include_opentelemetry_logs_logger.h | 11 +++++++++++ ...atch-api_include_opentelemetry_logs_logger__type__traits.h | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h new file mode 100644 index 000000000000..332f955f1bdf --- /dev/null +++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_event__logger.h @@ -0,0 +1,11 @@ +--- api/include/opentelemetry/logs/event_logger.h.orig 2024-07-17 20:04:10 UTC ++++ api/include/opentelemetry/logs/event_logger.h +@@ -66,7 +66,7 @@ class EventLogger (public) + nostd::unique_ptr log_record = delegate_logger->CreateLogRecord(); + + IgnoreTraitResult( +- detail::LogRecordSetterTrait::type>::template Set( ++ detail::LogRecordSetterTrait::type>::template Set<>( + log_record.get(), std::forward(args))...); + + EmitEvent(event_name, std::move(log_record)); diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h new file mode 100644 index 000000000000..dc1c2541b51e --- /dev/null +++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger.h @@ -0,0 +1,11 @@ +--- api/include/opentelemetry/logs/logger.h.orig 2024-07-17 20:04:10 UTC ++++ api/include/opentelemetry/logs/logger.h +@@ -73,7 +73,7 @@ class Logger (public) + } + + IgnoreTraitResult( +- detail::LogRecordSetterTrait::type>::template Set( ++ detail::LogRecordSetterTrait::type>::template Set<>( + log_record.get(), std::forward(args))...); + + EmitLogRecord(std::move(log_record)); diff --git a/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h new file mode 100644 index 000000000000..46d4327274a5 --- /dev/null +++ b/devel/opentelemetry-cpp/files/patch-api_include_opentelemetry_logs_logger__type__traits.h @@ -0,0 +1,11 @@ +--- api/include/opentelemetry/logs/logger_type_traits.h.orig 2024-07-17 20:04:10 UTC ++++ api/include/opentelemetry/logs/logger_type_traits.h +@@ -166,7 +166,7 @@ struct LogRecordSetterTrait + * = nullptr> + inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept + { +- return LogRecordSetterTrait::template Set( ++ return LogRecordSetterTrait::template Set<>( + log_record, std::forward(arg)); + } +