From nobody Sun Sep 8 21:07:56 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 4X22cF0Rbjz5W7qq; Sun, 08 Sep 2024 21:07:57 +0000 (UTC) (envelope-from osa@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X22cD6xBpz4TPj; Sun, 8 Sep 2024 21:07:56 +0000 (UTC) (envelope-from osa@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725829677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=F20xyRJ5b74TiG2k9aTlG3KLeJibnrjNAokc96Gh5QY=; b=KF8kXqI0qEmI6aFFyR+VwPthMFQBvx7/z4yIvlTZJzd2M6uCBlbAKLIic2ErHyB9n9gr6J nmQV2KMeiZ6iCCe9aUMhxmyXUJojJRoc/ZJH/E3WNk2nSDYV3GgmJ2ZDuS6WFQaToHZIJN fWSp+cNgmaQWAJ1C+AYknSbIBpdTZDlEM2cnxGcOwEsb3D6hmOTY+/sCC+JFcNG9U2es/u yS4QbBXztzo0gY4WDpJq10P2GbDkRtLiiYuS5ONyUyTGf6MDFyU12TVpQPllx0RhuXUpHg JzHr68wScA8oQbxmMXgIP8MgrTAhGvtP7guaB64l01y6fRSG4Nt0n7+AFVO21w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725829677; a=rsa-sha256; cv=none; b=HIsUwdQsytA0j2jDfQA1hf2Q1Cjs+edKgwV4Hwr36DloYfnmbgaefRqBnaDJWwSHn79leb 819+MQOM4iKci+sWku0YTAGnj8BINe0Gc5KVrg7ht++I1Knq3ZUGmrv6l11rrBQ5BWb19L VNXjA9UQZ40YSV8wN6YO0Dpn20A4GcInaVYduDnfZXLdT1Y6LZTBpdUqR7jcx6ezCtcst8 Aa3N1MN+8K7dCKxp9NkH0B3fLCh6qbMZs5V7BI6A14fsoDVkVje5LB+NsCQbFRaoGvhHeK T1XNNVI4Kl97hPvjaj7EgCjWg/qmI8q5Ed9+mhayUFU8jSqa9uskKvEmsoGwaw== 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=1725829677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=F20xyRJ5b74TiG2k9aTlG3KLeJibnrjNAokc96Gh5QY=; b=Hq6yvRjj3VDgOC2N+BDQ+Wz/JD0rmRHe/iENhRUYeTw6VrzhFcV1L12Ku/wBGRp8OT50Dx havwd5nCzx5k60VmAlluXwd9b5cHCNTGOwdmb2GCHC2L5/pQknfeNmg3cV//DrAt1UZ4Z9 YbsJmoWLw8hZzpmbu2G6AF0GgUXQDuhCPeKVQbvHaFK7liA9JrNEJUpbwRfIle2mRcBH9M CrTMoi5TpG4SVqKuqK4A/2Jb/yEz+gWs3rCUuKYMo6DWN7hqi96rTz/N6pM7feWZ05MyH4 nhOv1d9GOrFYWLbk5XP3BSzo6McJZiqEfOiujae//CaWCAeHj0uz3Q9s/NgbcQ== Received: by freefall.freebsd.org (Postfix, from userid 975) id A2E61140E3; Sun, 08 Sep 2024 21:07:56 +0000 (UTC) Date: Sun, 8 Sep 2024 21:07:56 +0000 From: "Sergey A. Osokin" To: Dimitry Andric Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 66edcb86f651 - 2024Q3 - devel/opentelemetry-cpp: fix build with clang 19 Message-ID: References: <202409081748.488HmrQU026330@gitrepo.freebsd.org> 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-Disposition: inline In-Reply-To: <202409081748.488HmrQU026330@gitrepo.freebsd.org> Thank you, Dimitry. On Sun, Sep 08, 2024 at 05:48:53PM +0000, Dimitry Andric wrote: > 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)); > + } > +