You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.2 KiB
28 lines
1.2 KiB
diff -Naur ceph-10.2.3-orig/configure.ac ceph-10.2.3/configure.ac
|
|
--- ceph-10.2.3-orig/configure.ac 2016-09-21 17:48:55.000000000 +0200
|
|
+++ ceph-10.2.3/configure.ac 2019-04-22 11:36:01.000000000 +0200
|
|
@@ -854,9 +854,11 @@
|
|
# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
|
|
AS_IF([test "x$with_librocksdb_static" = "xyes"], [
|
|
AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes])
|
|
+ AC_CHECK_HEADER([zstd.h], [have_zstd=yes])
|
|
AC_CHECK_HEADER([lz4.h], [have_lz4=yes])])
|
|
AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"])
|
|
AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"])
|
|
+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"])
|
|
|
|
# needs libcurl and libxml2
|
|
if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
|
|
diff -Naur ceph-10.2.3-orig/src/Makefile-env.am ceph-10.2.3/src/Makefile-env.am
|
|
--- ceph-10.2.3-orig/src/Makefile-env.am 2016-09-21 17:48:55.000000000 +0200
|
|
+++ ceph-10.2.3/src/Makefile-env.am 2019-04-22 12:04:53.000000000 +0200
|
|
@@ -280,6 +280,9 @@
|
|
if HAVE_LZ4
|
|
LIBKV += -llz4
|
|
endif
|
|
+if HAVE_ZSTD
|
|
+LIBKV += -lzstd
|
|
+endif
|
|
endif # WITH_SLIBROCKSDB
|
|
LIBKV += -lz -lleveldb -lsnappy
|
|
LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS)
|