[PATCH] rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

The master commit 5c040d991510cb4ff0d74305889130e2d84fedc1 fixing issue
http://tracker.ceph.com/issues/23680 was backported to luminous for v12.2.11 by
a47e714e7f5ce803ba7d8986c5d954123b85fc8e which was included in
https://github.com/ceph/ceph/pull/24621, where it came as the first of a series
of five cherry-picks.

This, it turns out, was the wrong order - it should have come last since it
was a follow-up fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual backport of 5c040d991510cb4ff0d74305889130e2d84fedc1)

Gbp-Pq: Name radosgw-linkage-without-beast.patch

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index a58a1fce96b6e1ea21dbb6386c4503dc722d9ca3..db569295225b99c698a8431add61b450e1005f36 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -177,9 +177,7 @@ endif (WITH_RADOSGW_BEAST_FRONTEND)
 
 add_library(radosgw_a STATIC ${radosgw_srcs}
   $<TARGET_OBJECTS:civetweb_common_objs>)
-if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
-  target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
-endif()
+target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
 
 add_executable(radosgw rgw_main.cc)
 target_link_libraries(radosgw radosgw_a librados
@@ -195,10 +193,6 @@ add_dependencies(radosgw cls_rgw cls_lock cls_refcount
   cls_version cls_replica_log cls_user)
 install(TARGETS radosgw DESTINATION bin)
 
-if (WITH_RADOSGW_BEAST_FRONTEND)
-  target_link_libraries(radosgw_a ${OPENSSL_LIBRARIES})
-endif()
-
 set(radosgw_admin_srcs
   rgw_admin.cc
   rgw_orphan.cc)