From 128ef291884a7876519c1d0c88997248c7057d2a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 5 Jun 2019 17:30:30 +0200 Subject: [PATCH] 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 (cherry picked from commit fe632e2d886791e2168ee6200b5bf1bfe8c88d0e) --- ceph.spec.in | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 8c01cd28861f..ee82e9cb01b2 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -161,6 +161,7 @@ BuildRequires: libxml2-devel BuildRequires: libuuid-devel BuildRequires: make BuildRequires: parted +BuildRequires: patch BuildRequires: perl BuildRequires: pkgconfig BuildRequires: procps diff --git a/debian/control b/debian/control index 4be8197b36d8..56df3057f90b 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,7 @@ Build-Depends: bc, libxml2-dev, lsb-release, parted, + patch, pkg-config, python (>= 2.7), python-all-dev, -- 2.47.3