From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 1 Mar 2022 18:27:42 +0000 (-0500)
Subject: cmake/rgw: remove detection for curl_multi_wait
X-Git-Tag: v18.0.0~1283^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45214%2Fhead;p=ceph.git

cmake/rgw: remove detection for curl_multi_wait

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

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