build: make ninja-build package install always

we use ninja build as default build now, having it installed only with
make check enabled may make builds fail, if ran without make check.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit fa7821dd00b1577391db9518bbef0c7618b78ade)

diff --git a/ceph.spec.in b/ceph.spec.in
index cb3fa2d3677401eff01c04513197e480689979d9..7f272836e9603831c1559f9166a0bf6325ab908c 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -321,6 +321,7 @@ BuildRequires:      libbz2-devel
 BuildRequires: mozilla-nss-devel
 BuildRequires: keyutils-devel
 BuildRequires:  libopenssl-devel
+BuildRequires:  ninja
 BuildRequires:  openldap2-devel
 #BuildRequires:  krb5
 #BuildRequires:  krb5-devel
@@ -340,6 +341,7 @@ BuildRequires:      nss-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: libibverbs-devel
 BuildRequires:  librdmacm-devel
+BuildRequires:  ninja-build
 BuildRequires:  openldap-devel
 #BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
@@ -356,7 +358,6 @@ BuildRequires:      golang
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: golang-github-prometheus
 BuildRequires: libtool-ltdl-devel
-BuildRequires: ninja-build
 BuildRequires: xmlsec1
 BuildRequires: xmlsec1-devel
 %ifarch x86_64
@@ -376,7 +377,6 @@ BuildRequires:      golang-github-prometheus-prometheus
 BuildRequires: libxmlsec1-1
 BuildRequires: libxmlsec1-nss1
 BuildRequires: libxmlsec1-openssl1
-BuildRequires: ninja
 BuildRequires: python%{python3_pkgversion}-CherryPy
 BuildRequires: python%{python3_pkgversion}-PyJWT
 BuildRequires: python%{python3_pkgversion}-Routes

diff --git a/debian/control b/debian/control
index 2f68285c7ae12b1beb3f172dd584081c6c9db1a4..42e3ac430a7d24f516817fcba3ae43236764adef 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Build-Depends: automake,
                libxmlsec1-nss <pkg.ceph.check>,
                libxmlsec1-openssl <pkg.ceph.check>,
                libxmlsec1-dev <pkg.ceph.check>,
-               ninja-build <pkg.ceph.check>,
+               ninja-build,
                nlohmann-json3-dev <pkg.ceph.jaeger>,
                patch,
                pkg-config,