From 9ecd2a4a41b56f5eb3c0ac9c7cf4aaf0931f62b1 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 12 Nov 2018 12:59:18 -0500
Subject: [PATCH] rgw: link boost context/coroutines regardless of beast
 frontend

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 src/rgw/CMakeLists.txt       | 6 ++++--
 src/rgw/rgw_asio_frontend.cc | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index d818f857085..99add82c707 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -196,8 +196,7 @@ if(WITH_CURL_OPENSSL)
   target_link_libraries(rgw_a PRIVATE OpenSSL::Crypto)
 endif()
 
-if(WITH_RADOSGW_BEAST_FRONTEND)
-  target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)
+if(WITH_BOOST_CONTEXT)
   target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
 endif()
 
@@ -327,3 +326,6 @@ target_link_libraries(rgw_admin_user PRIVATE
 set_target_properties(rgw_admin_user PROPERTIES OUTPUT_NAME rgw_admin_user VERSION 1.0.0
   SOVERSION 0)
 install(TARGETS rgw_admin_user DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(WITH_BOOST_CONTEXT)
+  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
+endif()
diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
index 87c3a416669..c77ac4a6f81 100644
--- a/src/rgw/rgw_asio_frontend.cc
+++ b/src/rgw/rgw_asio_frontend.cc
@@ -6,6 +6,7 @@
 #include <vector>
 
 #include <boost/asio.hpp>
+#define BOOST_COROUTINES_NO_DEPRECATION_WARNING
 #include <boost/asio/spawn.hpp>
 #include <boost/intrusive/list.hpp>
 
-- 
2.47.3