From: Samuel Just <sjust@redhat.com>
Date: Tue, 15 Dec 2015 23:12:19 +0000 (-0800)
Subject: Revert "makefiles: remove bz2-dev from dependencies"
X-Git-Tag: v10.0.2~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6948%2Fhead;p=ceph.git

Revert "makefiles: remove bz2-dev from dependencies"
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 767a734a3866..3d667ef9b824 100644
--- 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
index 727069adc3f4..9d73ea717b6c 100644
--- 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
index 8e7aea3d181a..3d8a252e378b 100644
--- 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)