From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Mon, 28 Mar 2022 20:14:48 +0000 (+0530)
Subject: build: make ninja-build package install always
X-Git-Tag: v18.0.0~1083^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45677%2Fhead;p=ceph.git

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>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 649247308a79..73bd4dac243e 100644
--- 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 21a85ddc519a..d6ae83ebe831 100644
--- 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,