]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
debian, rpm: build rocksdb statically if we can
authorSage Weil <sage@redhat.com>
Tue, 29 Jul 2014 22:38:18 +0000 (15:38 -0700)
committerSage Weil <sage@redhat.com>
Fri, 1 Aug 2014 04:11:25 +0000 (21:11 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
ceph.spec.in
debian/rules

index 76068362d695b6c0759976453d17fb36b0c47c3a..c76492655d3f7d4db0d215bbdeec69de23036e57 100644 (file)
@@ -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"
index 91773313e5ce4339f9162c3a719bdf964bd6c62e..1fd2d6660098c522e6026126502cb5366182ec92 100755 (executable)
@@ -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.