From 213e0acf7e81aad1d7d24b0577463b80fc8a095b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Jul 2014 15:38:18 -0700 Subject: [PATCH] debian, rpm: build rocksdb statically if we can Signed-off-by: Sage Weil --- ceph.spec.in | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 76068362d695b..c76492655d3f7 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -309,6 +309,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'` --with-rest-bench \ --with-debug \ --enable-cephfs-java \ + --with-librocksdb-static=check \ $MY_CONF_OPT \ %{?_with_ocf} \ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" diff --git a/debian/rules b/debian/rules index 91773313e5ce4..1fd2d6660098c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,9 @@ extraopts += --with-ocf --with-rest-bench --with-nss extraopts += --with-debug extraopts += --enable-cephfs-java +# rocksdb is not packaged by anyone. build it if we can. +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. -- 2.39.5