diff mbox series

[meta-oe] opentelemetry-cpp: Fix build with clang-19

Message ID 20240909174446.608901-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] opentelemetry-cpp: Fix build with clang-19 | expand

Commit Message

Khem Raj Sept. 9, 2024, 5:44 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-Fix-build-with-clang-19.patch        | 56 +++++++++++++++++++
 .../opentelemetry/opentelemetry-cpp_1.16.1.bb |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch
new file mode 100644
index 0000000000..2651eb6a72
--- /dev/null
+++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch
@@ -0,0 +1,56 @@ 
+From 1a5b4035e4cb75b87c716b4ebd5ffe32cd604c6e Mon Sep 17 00:00:00 2001
+From: "Sergey A. Osokin" <osa@FreeBSD.org.ru>
+Date: Sun, 8 Sep 2024 17:14:25 -0400
+Subject: [PATCH] Fix build with clang 19
+
+Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281359
+for details.
+
+Upstream-Status: Submitted [https://github.com/open-telemetry/opentelemetry-cpp/pull/3055]
+Credit:	Dimitry Andric <dim@FreeBSD.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ api/include/opentelemetry/logs/event_logger.h       | 2 +-
+ api/include/opentelemetry/logs/logger.h             | 2 +-
+ api/include/opentelemetry/logs/logger_type_traits.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h
+index b5c94a70..5892e041 100644
+--- a/api/include/opentelemetry/logs/event_logger.h
++++ b/api/include/opentelemetry/logs/event_logger.h
+@@ -66,7 +66,7 @@ class EventLogger
+     nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord();
+ 
+     IgnoreTraitResult(
+-        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
++        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>(
+             log_record.get(), std::forward<ArgumentType>(args))...);
+ 
+     EmitEvent(event_name, std::move(log_record));
+diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h
+index dc09a0c2..19da3942 100644
+--- a/api/include/opentelemetry/logs/logger.h
++++ b/api/include/opentelemetry/logs/logger.h
+@@ -73,7 +73,7 @@ class Logger
+     }
+ 
+     IgnoreTraitResult(
+-        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set(
++        detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>(
+             log_record.get(), std::forward<ArgumentType>(args))...);
+ 
+     EmitLogRecord(std::move(log_record));
+diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h
+index 48613513..f140a545 100644
+--- a/api/include/opentelemetry/logs/logger_type_traits.h
++++ b/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<common::KeyValueIterable>::template Set(
++    return LogRecordSetterTrait<common::KeyValueIterable>::template Set<>(
+         log_record, std::forward<ArgumentType>(arg));
+   }
+ 
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb
index a52e7aef63..c7004cc78d 100644
--- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb
+++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb
@@ -8,7 +8,8 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 DEPENDS = "nlohmann-json"
 
-SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;"
+SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \
+           file://0001-Fix-build-with-clang-19.patch"
 SRCREV = "baecbb95bd63df53e0af16e87bc683967962c5f8"
 
 S = "${WORKDIR}/git"