commit: f073a2308e63db08fcc1c9d4624707c3b32da69e Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Fri Jun 20 14:05:20 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 18 13:22:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f073a230
dev-cpp/opentelemetry-cpp: add find_dependency if use="prometheus" by insert using sed, which is a workaround for these versions, and it had been fixed by upstream in v1.21.0. prometheus_exporter was added after release 1.3.0 Closes: https://bugs.gentoo.org/930064 Closes: https://bugs.gentoo.org/953948 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42678 Closes: https://github.com/gentoo/gentoo/pull/42678 Signed-off-by: Sam James <sam <AT> gentoo.org> ...etry-cpp-1.20.0.ebuild => opentelemetry-cpp-1.20.0-r1.ebuild} | 9 +++++++++ ...try-cpp-1.6.0-r2.ebuild => opentelemetry-cpp-1.6.0-r3.ebuild} | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0-r1.ebuild similarity index 78% rename from dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0.ebuild rename to dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0-r1.ebuild index 74a8525362a2..4f103d2baed2 100644 --- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0.ebuild +++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.20.0-r1.ebuild @@ -50,3 +50,12 @@ src_configure() { cmake_src_configure } + +src_install() { + cmake_src_install + + if use prometheus; then + sed '/^# Create imported target opentelemetry-cpp::prometheus_exporter/i\find_dependency(prometheus-cpp REQUIRED)\n' \ + -i "${ED}/usr/$(get_libdir)/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake" + fi +} diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r2.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r3.ebuild similarity index 82% rename from dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r2.ebuild rename to dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r3.ebuild index d4e6bb11b4ce..705ef34ff3aa 100644 --- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r2.ebuild +++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0-r3.ebuild @@ -51,6 +51,15 @@ src_configure() { cmake_src_configure } +src_install() { + cmake_src_install + + if use prometheus; then + sed '/^# Create imported target opentelemetry-cpp::prometheus_exporter/i\find_dependency(prometheus-cpp REQUIRED)\n' \ + -i "${ED}/usr/$(get_libdir)/cmake/opentelemetry-cpp/opentelemetry-cpp-target.cmake" + fi +} + src_test() { # curl tests fragile cmake_src_test -j1
