Revert "makefiles: remove bz2-dev from dependencies"

ceph · Dec 15, 2015 · 35542eb · 35542eb
1 parent 34ceddf
commit 35542eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -165,6 +165,7 @@ 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,6 +10,7 @@ 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
@@ -267,7 +267,7 @@ LIBOSD += $(LIBOSD_TYPES) $(LIBOS_TYPES)
 if WITH_SLIBROCKSDB
 LIBKV += rocksdb/librocksdb.a
 endif
-LIBKV += -lz -lleveldb -lsnappy
+LIBKV += -lbz2 -lz -lleveldb -lsnappy
 LIBOS += $(LIBOS_TYPES) $(LIBKV)
 
 LIBMON += $(LIBMON_TYPES)