commit 4907cb5ad751a683586500ca2970821e7fc1d606
Author: Jakub Bogusz <[email protected]>
Date: Mon Dec 26 20:16:12 2016 +0100
- updated to 4.13.5
- removed obsolete numa patch
- added detect-flags, pass EXTRA_CFLAGS to fix detection of lz4 with
headers in subdirectory
rocksdb-detect-flags.patch | 11 +++++++++++
rocksdb-numa.patch | 11 -----------
rocksdb.spec | 18 +++++++++---------
3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/rocksdb.spec b/rocksdb.spec
index 21a3ae7..8972a4e 100644
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -7,17 +7,17 @@
Summary: RocksDB: A Persistent Key-Value Store for Flash and RAM Storage
Summary(pl.UTF-8): RocksDB - trwała baza danych klucz-wartość dla pamięci
Flash i RAM
Name: rocksdb
-Version: 4.9
+Version: 4.13.5
Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/facebook/rocksdb/releases
Source0:
https://github.com/facebook/rocksdb/archive/%{name}-%{version}.tar.gz
-# Source0-md5: e23ab7b76faaa1fc4c96b86732b16448
+# Source0-md5: f94191cf37221c4541dfb4d7f544651e
Patch0: %{name}-libdir.patch
Patch1: make-programs.patch
-Patch2: %{name}-numa.patch
-Patch3: %{name}-jemalloc.patch
+Patch2: %{name}-jemalloc.patch
+Patch3: %{name}-detect-flags.patch
URL: http://rocksdb.org/
BuildRequires: bzip2-devel
BuildRequires: gflags-devel
@@ -27,11 +27,11 @@ BuildRequires: jemalloc-devel
BuildRequires: libatomic-devel
%endif
BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: lz4-devel
+BuildRequires: lz4-devel >= 1:1.7
BuildRequires: numactl-devel
BuildRequires: snappy-devel
BuildRequires: zlib-devel
-BuildRequires: zstd-devel
+BuildRequires: zstd-devel >= 0.8.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# std::__once_call, std::__once_callable non-function symbols
@@ -83,6 +83,7 @@ PLATFORM_LDFLAGS="-latomic" \
AM_DEFAULT_VERBOSITY=1 \
CC="%{__cc}" \
CXX="%{__cxx}" \
+ EXTRA_CFLAGS="$(pkg-config --cflags liblz4)" \
OPT="%{rpmcflags} %{!?debug:-DNDEBUG}" \
PORTABLE=1 \
%{!?with_debug:DEBUG_LEVEL=0}
@@ -107,13 +108,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc HISTORY.md LICENSE PATENTS README.md ROCKSDB_LITE.md
+%doc AUTHORS DEFAULT_OPTIONS_HISTORY.md DUMP_FORMAT.md HISTORY.md
LANGUAGE-BINDINGS.md LICENSE PATENTS README.md ROCKSDB_LITE.md USERS.md
%attr(755,root,root) %{_libdir}/librocksdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.4.9
+%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.4.13
%files devel
%defattr(644,root,root,755)
-%doc doc/*
%attr(755,root,root) %{_libdir}/librocksdb.so
%{_includedir}/rocksdb
diff --git a/rocksdb-detect-flags.patch b/rocksdb-detect-flags.patch
new file mode 100644
index 0000000..9b54fe6
--- /dev/null
+++ b/rocksdb-detect-flags.patch
@@ -0,0 +1,11 @@
+--- rocksdb-rocksdb-4.13.5/Makefile.orig 2016-12-26 19:15:47.176657758
+0100
++++ rocksdb-rocksdb-4.13.5/Makefile 2016-12-26 19:30:42.149980874 +0100
+@@ -137,7 +137,7 @@
+
+ AM_LINK = $(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ $(LDFLAGS)
$(COVERAGEFLAGS)
+ # detect what platform we're building on
+-dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)";
"$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
++dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)" CFLAGS="$(CFLAGS)";
"$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
+ # this file is generated by the previous line to set build flags and sources
+ include make_config.mk
+ CLEAN_FILES += make_config.mk
diff --git a/rocksdb-numa.patch b/rocksdb-numa.patch
deleted file mode 100644
index dd34955..0000000
--- a/rocksdb-numa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rocksdb-rocksdb-4.4.1/build_tools/build_detect_platform.orig
2016-02-19 00:13:33.000000000 +0100
-+++ rocksdb-rocksdb-4.4.1/build_tools/build_detect_platform 2016-04-09
19:06:31.474404792 +0200
-@@ -286,7 +286,7 @@
- # Test whether numa is available
- $CXX $CFLAGS -x c++ - -o /dev/null -lnuma 2>/dev/null <<EOF
- #include <numa.h>
-- #inlcude <numaif.h>
-+ #include <numaif.h>
- int main() {}
- EOF
- if [ "$?" = 0 ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rocksdb.git/commitdiff/4907cb5ad751a683586500ca2970821e7fc1d606
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
