public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rocksdb] rawhide: Updated disable-static patch
@ 2026-08-12 14:55 Jonny Heggheim
0 siblings, 0 replies; only message in thread
From: Jonny Heggheim @ 2026-08-12 14:55 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rocksdb
Branch : rawhide
Commit : c7f4951beada112fbce3f49ada5b81f85e19efa5
Author : Jonny Heggheim <hegjon@gmail.com>
Date : 2026-08-12T16:54:59+02:00
Stats : +17/-11 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/rocksdb/c/c7f4951beada112fbce3f49ada5b81f85e19efa5?branch=rawhide
Log:
Updated disable-static patch
---
diff --git a/disable-static.patch b/disable-static.patch
index ccee31d..f102649 100644
--- a/disable-static.patch
+++ b/disable-static.patch
@@ -1,16 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b18ef5..0484789 100644
+index 7b68431..8885859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1036,7 +1036,6 @@ if(USE_FOLLY_LITE)
- list(APPEND THIRDPARTY_LIBS glog)
+@@ -1227,7 +1227,6 @@ if(USE_FOLLY_LITE)
+ endif()
endif()
-set(ROCKSDB_STATIC_LIB rocksdb${ARTIFACT_SUFFIX})
set(ROCKSDB_SHARED_LIB rocksdb-shared${ARTIFACT_SUFFIX})
-@@ -1105,11 +1104,6 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}")
+@@ -1296,12 +1295,6 @@ 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)
@@ -19,19 +19,24 @@ index 0b18ef5..0484789 100644
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
- ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
-
+-
if(ROCKSDB_BUILD_SHARED)
add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
-@@ -1138,8 +1132,6 @@ endif()
+ target_include_directories(${ROCKSDB_SHARED_LIB} PUBLIC
+@@ -1327,11 +1320,7 @@ if(ROCKSDB_BUILD_SHARED)
+ endif()
+ endif()
- if(ROCKSDB_BUILD_SHARED AND NOT WIN32)
- set(ROCKSDB_LIB ${ROCKSDB_SHARED_LIB})
+-if(ROCKSDB_BUILD_SHARED AND NOT WIN32)
+- set(ROCKSDB_LIB ${ROCKSDB_SHARED_LIB})
-else()
- set(ROCKSDB_LIB ${ROCKSDB_STATIC_LIB})
- endif()
+-endif()
++set(ROCKSDB_LIB ${ROCKSDB_SHARED_LIB})
option(WITH_JNI "build with JNI" OFF)
-@@ -1204,13 +1196,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
+ # Tests are excluded from Release builds
+@@ -1395,14 +1384,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
@@ -42,6 +47,7 @@ index 0b18ef5..0484789 100644
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
- )
-
+-
if(ROCKSDB_BUILD_SHARED)
install(
+ TARGETS ${ROCKSDB_SHARED_LIB}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-12 14:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-12 14:55 [rpms/rocksdb] rawhide: Updated disable-static patch Jonny Heggheim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox