From fa7821dd00b1577391db9518bbef0c7618b78ade Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Tue, 29 Mar 2022 01:44:48 +0530 Subject: [PATCH] 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 --- ceph.spec.in | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 649247308a79f..73bd4dac243ec 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 21a85ddc519a6..d6ae83ebe8314 100644 --- a/debian/control +++ b/debian/control @@ -78,7 +78,7 @@ Build-Depends: automake, libxmlsec1-nss , libxmlsec1-openssl , libxmlsec1-dev , - ninja-build , + ninja-build, nlohmann-json3-dev , patch, pkg-config,