From 192a457ef38abc45f21b4ebaa681e8e6d28d8e6c Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 27 Dec 2019 14:10:52 +0300 Subject: [PATCH] leveldb revert to 1.18 --- system/base/leveldb/actions.py | 27 ++++++++++----------------- system/base/leveldb/pspec.xml | 10 +++------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/system/base/leveldb/actions.py b/system/base/leveldb/actions.py index 4fb0ced6..83d709fa 100644 --- a/system/base/leveldb/actions.py +++ b/system/base/leveldb/actions.py @@ -6,27 +6,20 @@ 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) - cmaketools.make() + shelltools.chmod("build_detect_platform", 0755) + autotools.make() -def check(): - cmaketools.make("test") +#def check(): + #autotools.make("check") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - #pisitools.dolib_so("libleveldb.so.1.18") - #pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so.1") - #pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so") + pisitools.dolib_so("libleveldb.so.1.18") + 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", "helpers/memenv/memenv.h") + pisitools.insinto("/usr/include", "include/*") + pisitools.insinto("/usr/include", "helpers/memenv/memenv.h") - pisitools.dodoc("README.md", "LICENSE", "NEWS", "AUTHORS") \ No newline at end of file + pisitools.dodoc("README", "LICENSE", "NEWS", "AUTHORS") \ No newline at end of file diff --git a/system/base/leveldb/pspec.xml b/system/base/leveldb/pspec.xml index cd5f3c02..78cd0a24 100644 --- a/system/base/leveldb/pspec.xml +++ b/system/base/leveldb/pspec.xml @@ -16,10 +16,7 @@ gperftools-devel snappy-devel - https://github.com/google/leveldb/archive/1.22.tar.gz - - 0001-Restore-soname-versioning-with-CMake-build.patch - + https://github.com/google/leveldb/archive/v1.18.tar.gz @@ -41,15 +38,14 @@ /usr/include - /usr/lib/cmake 2019-12-27 - 1.22 - Version bump + 1.18 + Rebuild idris Kalp idriskalp@gmail.com