- updated to 4.4.1 (note: new soname)

- added numa patch (fix libnuma detection)
- BR: numactl, zstd, jemalloc (preferred over libtcmalloc, since 3.x?)

diff --git a/rocksdb-numa.patch b/rocksdb-numa.patch
new file mode 100644 (file)
index 0000000..dd34955
--- /dev/null
+++ b/rocksdb-numa.patch
@@ -0,0 +1,11 @@
+--- 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

diff --git a/rocksdb.spec b/rocksdb.spec
index 1bebbe8220a702b1ea471a8c91dbfcd6e95c009d..cfc4d3ee36433abec5e6516afdf1d00ca1734e4a 100644 (file)
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -1,3 +1,4 @@
+# TODO: hdfs/java
 #
 # Conditional build:
 %bcond_with    tests           # build with tests
@@ -6,25 +7,30 @@
 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:       3.13.1
+Version:       4.4.1
 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: 2e0a6482ce1756bfdff73a0e09006a92
+# Source0-md5: ad38c27c09cea873296bfba68594335c
 Patch0:                %{name}-libdir.patch
 Patch1:                make-programs.patch
+Patch2:                %{name}-numa.patch
 URL:           http://rocksdb.org/
 BuildRequires: bzip2-devel
 BuildRequires: gflags-devel
+# libtcmalloc also supported, but jemalloc is preferred
+BuildRequires: jemalloc-devel
 %ifarch i386 i486
 BuildRequires: libatomic-devel
 %endif
 BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: libtcmalloc-devel
 BuildRequires: lz4-devel
+BuildRequires: numactl-devel
 BuildRequires: snappy-devel
 BuildRequires: zlib-devel
+BuildRequires: zstd-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # std::__once_call, std::__once_callable non-function symbols
@@ -65,6 +71,7 @@ Statyczna biblioteka RocksDB.
 %setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifarch i386 i486
@@ -75,16 +82,20 @@ PLATFORM_LDFLAGS="-latomic" \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
        OPT="%{rpmcflags} %{!?debug:-DNDEBUG}" \
+       PORTABLE=1 \
+       %{!?with_debug:DEBUG_LEVEL=0}
        WARNING_FLAGS="%{rpmcppflags} -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
+       %{!?with_debug:DEBUG_LEVEL=0} \
        INSTALL_PATH=$RPM_BUILD_ROOT%{_prefix} \
        INSTALL_LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 # reduntant symlink
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.3
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc HISTORY.md LICENSE PATENTS README.md ROCKSDB_LITE.md
 %attr(755,root,root) %{_libdir}/librocksdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.3.13
+%attr(755,root,root) %ghost %{_libdir}/librocksdb.so.4.4
 
 %files devel
 %defattr(644,root,root,755)