[Pkg-ceph-commits] [ceph] 04/06: build and statically link with bundled RocksDB

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 304662d
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Oct 29 02:03:42 2014

    build and statically link with bundled RocksDB
---
 debian/clean   | 1 +
 debian/control | 3 ++-
 debian/rules   | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/clean b/debian/clean
index e8c05a6..fe37bc0 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 configure
+src/rocksdb/util/build_version.cc
diff --git a/debian/control b/debian/control
index 73f7f25..d1624d1 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,8 @@ Build-Depends: debhelper (>= 9~),
                uuid-dev,
                uuid-runtime,
                xfslibs-dev,
-               yasm [amd64]
+               yasm [amd64],
+               zlib1g-dev
 Build-Conflicts: libcrypto++-dev
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
diff --git a/debian/rules b/debian/rules
index 6838203..85d7dc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ extraopts += --with-babeltrace
 ## do not build with lttng just yet, see #765842.
 #extraopts += --with-lttng
 
+## build bundled RocksDB
+extraopts += --with-librocksdb-static=check
+
 ifeq ($(DEB_HOST_ARCH), armel)
   # armel supports ARMv4t or above instructions sets.
   # libatomic-ops is only usable with Ceph for ARMv6 or above.
@@ -55,6 +58,7 @@ override_dh_auto_build:
 	cp -v src/upstart/rbdmap.conf debian/ceph.rbdmap.upstart
 
 override_dh_auto_clean:
+	dh_auto_clean --sourcedirectory=src/rocksdb
 	dh_auto_clean
 	rm -fv debian/*.upstart
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git