[packages/leveldb] - added rtti patch (don't disable rtti, ceph relies on it); release 2

qboosh qboosh at pld-linux.org
Thu Feb 17 17:39:12 CET 2022


commit 986eb9bb244c56d558c45e442e4962287cf26d21
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Feb 17 17:40:58 2022 +0100

    - added rtti patch (don't disable rtti, ceph relies on it); release 2

 leveldb-rtti.patch | 13 +++++++++++++
 leveldb.spec       |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/leveldb.spec b/leveldb.spec
index dd07f4d..05fd7fb 100644
--- a/leveldb.spec
+++ b/leveldb.spec
@@ -11,13 +11,14 @@ Summary:	LevelDB - key-value store library
 Summary(pl.UTF-8):	LevelDB - biblioteka bazy danych klucz-wartość
 Name:		leveldb
 Version:	1.23
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/google/leveldb/releases
 Source0:	https://github.com/google/leveldb/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	afbde776fb8760312009963f09a586c7
 Patch0:		%{name}-system-libs.patch
+Patch1:		%{name}-rtti.patch
 URL:		https://github.com/google/leveldb
 BuildRequires:	cmake >= 3.9
 %{?with_tests:BuildRequires:	gmock-devel}
@@ -68,6 +69,7 @@ Statyczna biblioteka LevelDB.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with static_libs}
diff --git a/leveldb-rtti.patch b/leveldb-rtti.patch
new file mode 100644
index 0000000..0755326
--- /dev/null
+++ b/leveldb-rtti.patch
@@ -0,0 +1,13 @@
+--- leveldb-1.23/CMakeLists.txt.orig	2022-02-17 16:24:38.753446617 +0100
++++ leveldb-1.23/CMakeLists.txt	2022-02-17 16:30:35.698510965 +0100
+@@ -70,10 +70,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSV
+   # 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/leveldb.git/commitdiff/986eb9bb244c56d558c45e442e4962287cf26d21



More information about the pld-cvs-commit mailing list