From 35542eb6ed331ddedbc1406b5d49342c675af0f8 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 15 Dec 2015 15:12:19 -0800 Subject: [PATCH] Revert "makefiles: remove bz2-dev from dependencies" --- ceph.spec.in | 1 + debian/control | 1 + src/Makefile-env.am | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 767a734a38660..3d667ef9b8246 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 727069adc3f45..9d73ea717b6cb 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Uploaders: Ken Dreyer , 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 8e7aea3d181a7..3d8a252e378be 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)