From 12555ea6e518805340ccc61d44728227677842ca Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 1 Mar 2022 13:27:42 -0500 Subject: [PATCH] cmake/rgw: remove detection for curl_multi_wait Signed-off-by: Casey Bodley --- CMakeLists.txt | 6 ++---- src/include/config-h.in.cmake | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a8b084b6e87..a754e47f5fba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index bc57eb4d9acc..6d3a25c5f52a 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -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 -- 2.47.3