RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake/os: remove WITH_ZFS option

Browse Source 
when enabled and found, the os_zfs_objs target would reference a missing
file filestore/ZFSFileStoreBackend.cc and cmake would fail to configure

i take this to mean that WITH_ZFS was accidentally left over from
filestore's removal. drop all references to WITH_ZFS, along with the
corresponding Findzfs.cmake script

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2024-07-03 14:52:01 -04:00
parent e884e3ae02
commit 52be40e256
3 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -242,12 +242,6 @@ if(WITH_XFS)
set(HAVE_LIBXFS ${XFS_FOUND})
endif()
option(WITH_ZFS "enable LibZFS if found" OFF)
if(WITH_ZFS)
find_package(zfs)
set(HAVE_LIBZFS ${ZFS_FOUND})
endif()
option(WITH_BLUESTORE "Bluestore OSD backend" ON)
if(WITH_BLUESTORE)
if(LINUX)

28
cmake/modules/Findzfs.cmake
View File

@ -1,28 +0,0 @@
# find libzfs or libzfslinux
# Once done, this will define
#
# ZFS_FOUND - system has libzfs
# ZFS_INCLUDE_DIR - the libzfs include directories
# ZFS_LIBRARIES - link these to use libzfs
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
pkg_check_modules(ZFS QUIET libzfs)
else()
find_path(ZFS_INCLUDE_DIR libzfs.h
HINTS
ENV ZFS_DIR
PATH_SUFFIXES libzfs)
find_library(ZFS_LIBRARIES
NAMES zfs
HINTS
ENV ZFS_DIR)
set(XFS_LIBRARIES ${LIBXFS})
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(zfs DEFAULT_MSG
ZFS_INCLUDE_DIRS ZFS_LIBRARIES)
mark_as_advanced(ZFS_INCLUDE_DIRS XFS_LIBRARIES)

13
src/os/CMakeLists.txt
View File

@ -37,15 +37,6 @@ if(HAVE_LIBXFS)
fs/XFS.cc)
endif()
if(HAVE_LIBZFS)
add_library(os_zfs_objs OBJECT
filestore/ZFSFileStoreBackend.cc
fs/ZFS.cc)
target_include_directories(os_zfs_objs SYSTEM PRIVATE
${ZFS_INCLUDE_DIRS})
list(APPEND libos_srcs $<TARGET_OBJECTS:os_zfs_objs>)
endif()
add_library(os STATIC ${libos_srcs})
target_link_libraries(os
legacy-option-headers
@ -66,10 +57,6 @@ if(WITH_FUSE)
target_link_libraries(os FUSE::FUSE)
endif()
if(HAVE_LIBZFS)
target_link_libraries(os ${ZFS_LIBRARIES})
endif()
if(WITH_LTTNG)
add_dependencies(os objectstore-tp)
add_dependencies(os bluestore-tp)