From b92ddd9c0e8cd916c86e7772ea3b9b322ab177e2 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 27 Jun 2022 11:57:50 +0300 Subject: [PATCH] leveldb-1.23 --- system/base/leveldb/actions.py | 2 ++ .../base/leveldb/files/0006-revert-no-rtti.patch | 15 +++++++++++++++ system/base/leveldb/pspec.xml | 12 +++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 system/base/leveldb/files/0006-revert-no-rtti.patch diff --git a/system/base/leveldb/actions.py b/system/base/leveldb/actions.py index 1d039a7c..d0684fb1 100644 --- a/system/base/leveldb/actions.py +++ b/system/base/leveldb/actions.py @@ -14,6 +14,8 @@ def setup(): shelltools.makedirs("build") shelltools.cd("build") cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DLEVELDB_BUILD_TESTS:BOOL=OFF \ + -DLEVELDB_BUILD_BENCHMARKS:BOOL=OFF \ -DBUILD_SHARED_LIBS=1", sourceDir="..") def build(): diff --git a/system/base/leveldb/files/0006-revert-no-rtti.patch b/system/base/leveldb/files/0006-revert-no-rtti.patch new file mode 100644 index 00000000..d6937ff5 --- /dev/null +++ b/system/base/leveldb/files/0006-revert-no-rtti.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8285b8..7ab9fe1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,10 +70,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Disable C++ exceptions. + string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") +- +- # Disable RTTI. +- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") + endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + + # Test whether -Wthread-safety is available. See diff --git a/system/base/leveldb/pspec.xml b/system/base/leveldb/pspec.xml index d0c678b6..1a37c8de 100644 --- a/system/base/leveldb/pspec.xml +++ b/system/base/leveldb/pspec.xml @@ -12,13 +12,16 @@ app:console A fast and lightweight key/value database library LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. + https://github.com/google/leveldb/archive/1.23.tar.gz cmake sqlite-devel snappy-devel gperftools-devel - https://github.com/google/leveldb/archive/1.22.tar.gz + + 0006-revert-no-rtti.patch + @@ -45,6 +48,13 @@ + + 2022-06-26 + 1.23 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-11-06 1.22