From 265d24f09eb6105fb6e07b2cc746febb4c970204 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Thu, 9 Jun 2022 15:20:10 +1000 Subject: [PATCH] ceph.spec.in: turn jaeger off by default for SUSE distros Building with jaeger by default pulls in opentelemetry, and cmake/modules/BuildOpentelemetry.cmake tries to go get https://github.com/ideepika/opentelemetry-cpp.git at build time, which doesn't work on SUSE's build service (no internet access at build time). Also, since WITH_JAEGER now defaults to ON in CMakeLists.txt, we need to flip the logic when setting -DWITH_JAEGER. Fixes: 644c99826d73174e6609aa24b7297443358488b1 Fixes: 7be8be63501ba03da9b705238a9d3d3a518969ab Signed-off-by: Tim Serong --- ceph.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 13523b8afde..a320170b5c7 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -86,7 +86,11 @@ %endif %endif %bcond_with seastar +%if 0%{?suse_version} +%bcond_with jaeger +%else %bcond_without jaeger +%endif %if 0%{?fedora} || 0%{?suse_version} >= 1500 # distros that ship cmd2 and/or colorama %bcond_without cephfs_shell @@ -1362,8 +1366,8 @@ cmake .. \ %if 0%{with system_pmdk} -DWITH_SYSTEM_PMDK:BOOL=ON \ %endif -%if 0%{with jaeger} - -DWITH_JAEGER:BOOL=ON \ +%if 0%{without jaeger} + -DWITH_JAEGER:BOOL=OFF \ %endif %if 0%{?suse_version} -DBOOST_J:STRING=%{jobs} \ -- 2.39.5