mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
6d6c0b99d3
Remove not exist PACKAGECONFIG option `lite` Add new PACKAGECONFIG option liburing Changelog: v10.10.1 https://github.com/facebook/rocksdb/releases/tag/v10.10.1 Bugs: - Fixed a bug in best-efforts recovery that causes use-after-free crashes when accessing SST files that were cached during the recovery. - Fix resumable compaction incorrectly allowing resumption from a truncated range deletion that is not well handled currently. - Fixed a bug in PosixRandomFileAccess IO uring submission queue ownership & management. Fix eliminates the false positive 'Bad cqe data' IO errors in PosixRandomFileAccess::MultiRead when interleaved with PosixRandomFileAccess::ReadAsync on the same thread. - Fix Windows VS 2022 build errors. v10.9.1: https://github.com/facebook/rocksdb/releases/tag/v10.9.1 v10.8.3: https://github.com/facebook/rocksdb/releases/tag/v10.8.3 v10.7.5: https://github.com/facebook/rocksdb/releases/tag/v10.7.5 v10.6.2: https://github.com/facebook/rocksdb/releases/tag/v10.6.2 v10.5.1: https://github.com/facebook/rocksdb/releases/tag/v10.5.1 v10.4.2: https://github.com/facebook/rocksdb/releases/tag/v10.4.2 v10.2.1: https://github.com/facebook/rocksdb/releases/tag/v10.2.1 v10.1.3: https://github.com/facebook/rocksdb/releases/tag/v10.1.3 v10.0.1: https://github.com/facebook/rocksdb/releases/tag/v10.0.1 Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
72 lines
2.7 KiB
Diff
72 lines
2.7 KiB
Diff
From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001
|
|
From: Bindu-Bhabu <bindudaniel1996@gmail.com>
|
|
Date: Fri, 26 Jul 2024 15:14:45 +0530
|
|
Subject: Add option to CMake for building static libraries
|
|
|
|
ROCKSDB creates a STATIC library target reference by default.
|
|
Modify the cmake so that the STATIC library is also an option
|
|
just like creating a SHARED library and set default to ON.
|
|
|
|
Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890]
|
|
|
|
Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
|
|
Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com>
|
|
---
|
|
CMakeLists.txt | 29 +++++++++++++++++------------
|
|
1 file changed, 17 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 93b884dd9c1..2ca925d505c 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -98,6 +98,7 @@ if (WITH_WINDOWS_UTF8_FILENAMES)
|
|
add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
|
|
endif()
|
|
option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
|
|
+option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON)
|
|
|
|
if( NOT DEFINED CMAKE_CXX_STANDARD )
|
|
set(CMAKE_CXX_STANDARD 20)
|
|
@@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}")
|
|
set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
|
|
configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
|
|
|
|
-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
|
|
-target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
|
|
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
|
|
-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
|
|
- ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
|
+if(ROCKSDB_BUILD_STATIC)
|
|
+ add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
|
|
+ target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
|
|
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
|
|
+ target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
|
|
+ ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
|
+endif()
|
|
|
|
if(ROCKSDB_BUILD_SHARED)
|
|
add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
|
|
@@ -1238,13 +1241,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
|
|
|
|
install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
|
|
|
|
- install(
|
|
- TARGETS ${ROCKSDB_STATIC_LIB}
|
|
- EXPORT RocksDBTargets
|
|
- COMPONENT devel
|
|
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
- )
|
|
+ if(ROCKSDB_BUILD_STATIC)
|
|
+ install(
|
|
+ TARGETS ${ROCKSDB_STATIC_LIB}
|
|
+ EXPORT RocksDBTargets
|
|
+ COMPONENT devel
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
+ )
|
|
+ endif()
|
|
|
|
if(ROCKSDB_BUILD_SHARED)
|
|
install(
|