]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: turn jaeger off by default for SUSE distros 46586/head
authorTim Serong <tserong@suse.com>
Thu, 9 Jun 2022 05:20:10 +0000 (15:20 +1000)
committerTim Serong <tserong@suse.com>
Thu, 9 Jun 2022 06:23:50 +0000 (16:23 +1000)
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 <tserong@suse.com>
ceph.spec.in

index 13523b8afde343df92bde170c1d179e434aa5ad0..a320170b5c734adf0c766580193b8811333a73b8 100644 (file)
 %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} \