gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/ceph: Improve jaeger/opentelemetry

Browse Source 
Partial fix, improves detection of libraries.
Doesn't compile yet due to abseil-cpp.

Bug: https://bugs.gentoo.org/930064
Bug: https://bugs.gentoo.org/962988
Signed-off-by: Patrick Lauer <patrick@gentoo.org>
This commit is contained in:
Patrick Lauer
2025-09-17 07:58:36 +00:00
parent c7d1df0fd4
commit 5afcdbf9eb
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sys-cluster/ceph/ceph-20.1.0-r1.ebuild → sys-cluster/ceph/ceph-20.1.0-r2.ebuild
View File

@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
SLOT="0"
KEYWORDS="~amd64 ~ppc64"
KEYWORDS="~amd64"
CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
@@ -84,7 +84,7 @@ DEPEND="
!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
jaeger? (
dev-cpp/nlohmann_json:=
<dev-cpp/opentelemetry-cpp-1.10.0:=[jaeger]
<dev-cpp/opentelemetry-cpp-1.10:=[jaeger,prometheus]
)
kafka? ( dev-libs/librdkafka:= )
kerberos? ( virtual/krb5 )
@@ -229,6 +229,7 @@ PATCHES=(
"${FILESDIR}/ceph-18.2.4-spdk.patch"
"${FILESDIR}/ceph-19.2.1-isa-l.patch"
"${FILESDIR}/ceph-20.1.0-nvmeof.patch"
"${FILESDIR}/ceph-20.1.0-opentelemetry.patch"
)
check-reqs_export_vars() {

48
sys-cluster/ceph/files/ceph-20.1.0-opentelemetry.patch Normal file
View File

@@ -0,0 +1,48 @@
From 8e0d3dc90ab7bafc59b86e9a66d08d1e2b6f3e0e Mon Sep 17 00:00:00 2001
From: "Z. Liu" <zhixu.liu@gmail.com>
Date: Tue, 15 Apr 2025 21:48:10 +0800
Subject: [PATCH] CMakeLists.txt: fix opentelemetry library
otherwise, cmake failed with:
> CMake Error at src/CMakeLists.txt:443 (target_link_libraries):
> The link interface of target "jaeger_base" contains:
>
> opentelemetry::libopentelemetry
>
> but the target was not found. Possible reasons include:
>
> * There is a typo in the target name.
> * A find_package call is missing for an IMPORTED target.
> * An ALIAS target is missing.
See also: https://bugs.gentoo.org/930064
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 801086e1268a1..5d30cde9790d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -330,7 +330,7 @@ if(WITH_JAEGER)
include(BuildOpentelemetry)
build_opentelemetry()
add_library(jaeger_base INTERFACE)
- target_link_libraries(jaeger_base INTERFACE opentelemetry::libopentelemetry
+ target_link_libraries(jaeger_base INTERFACE ${OPENTELEMETRY_CPP_LIBRARIES}
thrift::libthrift)
endif()
--- a/src/CMakeLists.txt 2025-09-17 07:24:59.548258925 -0000
+++ b/src/CMakeLists.txt 2025-09-17 07:28:31.449345268 -0000
@@ -319,6 +319,7 @@
if(WITH_JAEGER)
find_package(thrift 0.13.0 REQUIRED)
+ find_package(prometheus-cpp REQUIRED)
find_package(opentelemetry-cpp REQUIRED)
set(jaeger_base
opentelemetry-cpp::common