RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake/rgw: remove detection for curl_multi_wait

Browse Source 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2022-03-01 13:27:42 -05:00
parent a379fdc52e
commit 12555ea6e5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -363,10 +363,8 @@ else()
set(EXE_LINKER_USE_PIE ${ENABLE_SHARED})
endif()
find_package(CURL REQUIRED)
set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES})
CHECK_SYMBOL_EXISTS(curl_multi_wait curl/curl.h HAVE_CURL_MULTI_WAIT)
# require libcurl with good curl_multi_wait(), see https://tracker.ceph.com/issues/15915
find_package(CURL 7.32 REQUIRED)
find_package(OpenSSL REQUIRED)
set(CRYPTO_LIBS OpenSSL::Crypto)

3
src/include/config-h.in.cmake
View File

@ -121,9 +121,6 @@
#cmakedefine HAVE_LIBTCMALLOC
#cmakedefine LIBTCMALLOC_MISSING_ALIGNED_ALLOC
/* Define if have curl_multi_wait() */
#cmakedefine HAVE_CURL_MULTI_WAIT 1
/* AsyncMessenger RDMA conditional compilation */
#cmakedefine HAVE_RDMA