makefiles: remove bz2-dev from dependencies

The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.

Fixes: #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 3d667ef9b824684bc0fe77951f7f51637aedff5d..767a734a3866039cc101d0b4579de5cc58126532 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -165,7 +165,6 @@ BuildRequires:      libatomic-ops-devel
 %if 0%{?_with_systemd}
 Requires:      systemd
 %endif
-BuildRequires:  bzip2-devel
 BuildRequires: nss-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: libatomic_ops-devel

diff --git a/debian/control b/debian/control
index 9d73ea717b6cb696f84ec5972f9673b7167d1d5e..727069adc3f4530ba29021a12fdf57f0107a9302 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Uploaders: Ken Dreyer <kdreyer@redhat.com>,
 Build-Depends: autoconf,
                automake,
                autotools-dev,
-              libbz2-dev,
               cmake,
               cryptsetup-bin | cryptsetup,
                cython,

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 3d8a252e378be7390c3e16414d37ccc3a9aec206..8e7aea3d181a72e4ab9d1bacb0a6b0e94e9e52a0 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -267,7 +267,7 @@ LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)
 if WITH_SLIBROCKSDB
 LIBKV += rocksdb/librocksdb.a
 endif
-LIBKV += -lbz2 -lz -lleveldb -lsnappy
+LIBKV += -lz -lleveldb -lsnappy
 LIBOS += $(LIBOS_TYPES) $(LIBKV)
 
 LIBMON += $(LIBMON_TYPES)