From 1f8f76fea39d86086b70da1bcc79083f777a70b6 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 8 Feb 2019 12:34:19 +0100 Subject: [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 (partial manual backport of 5c040d991510cb4ff0d74305889130e2d84fedc1) --- src/rgw/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 57cb2a5b94ce9..48a399b877ec1 100644 --- 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} $) -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) -- 2.39.5