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: ceph#13981 Signed-off-by: Piotr Dałek <[email protected]>
bitfehler · Dec 15, 2015 · a8b5920 · a8b5920
1 parent 736532c
commit a8b5920
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -10,7 +10,6 @@ Uploaders: Ken Dreyer <[email protected]>,
 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
@@ -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)