Skip to content

Commit 12555ea

Browse files
committed
cmake/rgw: remove detection for curl_multi_wait
Signed-off-by: Casey Bodley <[email protected]>
1 parent a379fdc commit 12555ea

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,8 @@ else()
363363
set(EXE_LINKER_USE_PIE ${ENABLE_SHARED})
364364
endif()
365365

366-
find_package(CURL REQUIRED)
367-
set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
368-
set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES})
369-
CHECK_SYMBOL_EXISTS(curl_multi_wait curl/curl.h HAVE_CURL_MULTI_WAIT)
366+
# require libcurl with good curl_multi_wait(), see https://tracker.ceph.com/issues/15915
367+
find_package(CURL 7.32 REQUIRED)
370368

371369
find_package(OpenSSL REQUIRED)
372370
set(CRYPTO_LIBS OpenSSL::Crypto)

src/include/config-h.in.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@
121121
#cmakedefine HAVE_LIBTCMALLOC
122122
#cmakedefine LIBTCMALLOC_MISSING_ALIGNED_ALLOC
123123

124-
/* Define if have curl_multi_wait() */
125-
#cmakedefine HAVE_CURL_MULTI_WAIT 1
126-
127124
/* AsyncMessenger RDMA conditional compilation */
128125
#cmakedefine HAVE_RDMA
129126

0 commit comments

Comments
 (0)