leveldb 1.22

system/base/leveldb/actions.py

@@ -6,20 +6,27 @@
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
+from pisi.actionsapi import get
+
+def setup():
+    cmaketools.configure("-DBUILD_SHARED_LIBS=ON \
+		                  -DCMAKE_INSTALL_LIBDIR=lib")
 
 def build():
-    shelltools.chmod("build_detect_platform", 0755)
+    #shelltools.chmod("build_detect_platform", 0755)
-    autotools.make()
+    cmaketools.make()
 
 def check():
-    autotools.make("check")
+    cmaketools.make("test")
 
 def install():
-    pisitools.dolib_so("libleveldb.so.1.18")
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so.1")
+    #pisitools.dolib_so("libleveldb.so.1.18")
-    pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so")
+    #pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so.1")
+    #pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so")
 
-    pisitools.insinto("/usr/include", "include/*")
+    #pisitools.insinto("/usr/include", "include/*")
-    pisitools.insinto("/usr/include", "helpers/memenv/memenv.h")
+    #pisitools.insinto("/usr/include", "helpers/memenv/memenv.h")
 
-    pisitools.dodoc("README", "LICENSE", "NEWS", "AUTHORS")
+    pisitools.dodoc("README.md", "LICENSE", "NEWS", "AUTHORS")

system/base/leveldb/files/0001-Restore-soname-versioning-with-CMake-build.patch

@@ -0,0 +1,39 @@
+From 37300aa54b8256dd2edfd504942eb2bd20823647 Mon Sep 17 00:00:00 2001
+From: leveldb Team <no-reply@google.com>
+Date: Mon, 1 Apr 2019 08:59:17 -0700
+Subject: [PATCH] Restore soname versioning with CMake build
+
+Before:
+
+$ readelf -d build/libleveldb.so | grep soname
+ 0x000000000000000e (SONAME)             Library soname: [libleveldb.so]
+
+After:
+$ readelf -d build/libleveldb.so | grep soname
+ 0x000000000000000e (SONAME)             Library soname: [libleveldb.so.1]
+
+This matches the soname from v1.20.
+
+PiperOrigin-RevId: 241334113
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e471a2a..ceb5dd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,6 +233,10 @@ if(BUILD_SHARED_LIBS)
+       # Used by include/export.h.
+       LEVELDB_SHARED_LIBRARY
+   )
++  set_target_properties(leveldb
++    PROPERTIES VERSION ${PROJECT_VERSION})
++  set_target_properties(leveldb
++    PROPERTIES SOVERSION 1)
+ endif(BUILD_SHARED_LIBS)
+ 
+ if(HAVE_CLANG_THREAD_SAFETY)
+-- 
+2.21.0
+

system/base/leveldb/pspec.xml

@@ -16,7 +16,10 @@
             <Dependency>gperftools-devel</Dependency>
             <Dependency>snappy-devel</Dependency>
         </BuildDependencies>
-        <Archive sha1sum="18684a0ad7a07920d10f5295b171fbf5eeec7337" type="targz">https://github.com/google/leveldb/archive/v1.18.tar.gz</Archive>
+        <Archive sha1sum="8d310af5cfb53dc836bfb412ff4b3c8aea578627" type="targz">https://github.com/google/leveldb/archive/1.22.tar.gz</Archive>
+		<Patches>
+			<Patch level="1">0001-Restore-soname-versioning-with-CMake-build.patch</Patch>
+		</Patches>
     </Source>
 
     <Package>
@@ -38,10 +41,18 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
+			<Path fileType="data">/usr/lib/cmake</Path>
         </Files>
     </Package>
 
     <History>
+		<Update release="5">
+            <Date>2019-12-27</Date>
+            <Version>1.22</Version>
+            <Comment>Version bump</Comment>
+            <Name>idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-07-15</Date>
             <Version>1.18</Version>