From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 5 Jun 2019 15:30:30 +0000 (+0200)
Subject: build/ops: make "patch" build dependency explicit
X-Git-Tag: v14.2.5~58^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30045%2Fhead;p=ceph.git

build/ops: make "patch" build dependency explicit

This commit adds "patch" as an explicit build dependency. Before, the RPM
build was installing it in the build environment via some mechanism that I
don't entirely understand.

The "patch" command is used by the BuildBoost cmake module.

Fixes: http://tracker.ceph.com/issues/40175
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fe632e2d886791e2168ee6200b5bf1bfe8c88d0e)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 734542815756..66dfe2686a98 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -174,6 +174,7 @@ BuildRequires:	libuuid-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	parted
+BuildRequires:	patch
 BuildRequires:	perl
 BuildRequires:	pkgconfig
 BuildRequires:  procps
diff --git a/debian/control b/debian/control
index b073073ba137..d821770143bc 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Build-Depends: cmake (>= 3.5),
                librabbitmq-dev,
                lsb-release,
                parted,
+               patch,
                pkg-config,
                python (>= 2.7),
                python-all-dev,