From a8b5920259f55e88fef249544c6618b3c84beed7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Piotr=20Da=C5=82ek?= Date: Tue, 15 Dec 2015 14:01:51 +0100 Subject: [PATCH] makefiles: remove bz2-dev from dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- ceph.spec.in | 1 - debian/control | 1 - src/Makefile-env.am | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3d667ef9b8246..767a734a38660 100644 --- 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 9d73ea717b6cb..727069adc3f45 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ 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 3d8a252e378be..8e7aea3d181a7 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 += -lbz2 -lz -lleveldb -lsnappy +LIBKV += -lz -lleveldb -lsnappy LIBOS += $(LIBOS_TYPES) $(LIBKV) LIBMON += $(LIBMON_TYPES) -- 2.39.5