diff options
Diffstat (limited to 'sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch')
| -rw-r--r-- | sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch new file mode 100644 index 000000000000..c50cca4e2ca0 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch @@ -0,0 +1,40 @@ +diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt +index b53b0d9444..5bf5796da2 100644 +--- a/src/compressor/zstd/CMakeLists.txt ++++ b/src/compressor/zstd/CMakeLists.txt +@@ -1,34 +1,11 @@ + # zstd + +-# libzstd - build it statically +-set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") +- +-include(ExternalProject) +-ExternalProject_Add(zstd_ext +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake +- CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +- -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS} +- -DCMAKE_AR=${CMAKE_AR} +- -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED} +- -G${CMAKE_GENERATOR} +- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static +- BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a" +- INSTALL_COMMAND "true") +- +-add_library(zstd STATIC IMPORTED) +-set_target_properties(zstd PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib" +- IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a") +-add_dependencies(zstd zstd_ext) +- + set(zstd_sources + CompressionPluginZstd.cc + ) + + add_library(ceph_zstd SHARED ${zstd_sources}) +-target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>) ++target_link_libraries(ceph_zstd zstd) + set_target_properties(ceph_zstd PROPERTIES + VERSION 2.0.0 + SOVERSION 2 |