From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Wed, 16 Dec 2020 12:39:00 +0000 (+0530)
Subject: debian/control: update yaml-cpp version if building with Jaeger
X-Git-Tag: v16.1.0~238^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8213f07b68c22380930c40a738c438a641be375;p=ceph.git

debian/control: update yaml-cpp version if building with Jaeger

jaeger specifically requires yaml-dev +0.6 but since all supported
distro(bionic) still doesn't have this version, yaml-cpp will be build
from source if enabled.
This fixes the build failure:
```
Could NOT find yaml-cpp: Found unsuitable version "", but required is at
  least "0.5.1" (found yaml-cpp_LIBRARY-NOTFOUND)
```

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

diff --git a/debian/control b/debian/control
index e894e5028f24..a2abffcc661f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Maintainer: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
 Uploaders: Ken Dreyer <kdreyer@redhat.com>,
            Alfredo Deza <adeza@redhat.com>,
 Build-Depends: automake,
-               bison,
+# Jaeger       bison,
                cmake (>= 3.10.2),
                cpio,
                cryptsetup-bin | cryptsetup,
@@ -19,7 +19,7 @@ Build-Depends: automake,
                dh-exec,
                dh-python,
                dh-systemd,
-               flex,
+# Jaeger       flex,
                git,
                gperf,
                g++ (>= 7),
@@ -36,7 +36,7 @@ Build-Depends: automake,
                libcap-ng-dev,
                libcunit1-dev,
                libcurl4-openssl-dev,
-               libevent-dev,
+# Jaeger       libevent-dev,
                libexpat1-dev,
 # Make-Check   libffi-dev [!amd64],
                libfuse-dev,
@@ -70,8 +70,9 @@ Build-Depends: automake,
 # Make-Check   libxmlsec1-nss,
 # Make-Check   libxmlsec1-openssl,
 # Make-Check   libxmlsec1-dev,
+# Crimson      libyaml-cpp-dev,
                lsb-release,
-               nlohmann-json-dev | nlohmann-json3-dev,
+# Jaeger       nlohmann-json-dev | nlohmann-json3-dev,
                parted,
                patch,
                pkg-config,
@@ -105,7 +106,7 @@ Build-Depends: automake,
 # Make-Check   xmlstarlet,
                nasm [amd64],
                zlib1g-dev,
-Built-Using:   libyaml-cpp-dev (>= 0.6),
+# Jaeger       Built-Using:   libyaml-cpp-dev (>= 0.6),
 Standards-Version: 4.4.0
 
 Package: ceph