From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Mon, 30 Nov 2020 11:10:46 +0000 (+0000)
Subject: debian/control: use yaml-dev >= 0.6
X-Git-Tag: v16.1.0~250^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e6e1f907eefbc213e297619e9b63df0bd54870d;p=ceph.git

debian/control: use yaml-dev >= 0.6

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
---

diff --git a/debian/control b/debian/control
index f9e1d502f104..50e2f665adfb 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,6 @@ Build-Depends: automake,
                libudev-dev,
                libnl-genl-3-dev,
                libxml2-dev,
-               libyaml-cpp-dev,
                librabbitmq-dev,
                librdkafka-dev,
 # Make-Check   libxmlsec1,
@@ -104,6 +103,7 @@ Build-Depends: automake,
 # Make-Check   xmlstarlet,
                nasm [amd64],
                zlib1g-dev,
+Built-Using:   libyaml-cpp-dev (>= 0.6),
 Standards-Version: 4.4.0
 
 Package: ceph
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd2312cfe964..ef8a5f206107 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -393,7 +393,9 @@ add_library(common-objs OBJECT ${libcommon_files})
 if(WITH_JAEGER)
   find_package(yaml-cpp 0.6.0)
   if(NOT yaml-cpp_FOUND)
-    set(jaeger_libs ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6.2)
+    set(jaeger_libs ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so
+		    ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6
+		    ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6.2)
     execute_process(COMMAND bash -c "grep -q 'yaml-cpp' debian/libjaeger.install || echo 'usr/lib/libyaml-cpp.so.*' >> debian/libjaeger.install"
 		    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
   endif()