From 270d98e6a27c46fe92325477fa599c147c67b87d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 6 Nov 2019 15:55:46 -0500 Subject: [PATCH] git: add submodule for spawn library Signed-off-by: Casey Bodley (cherry picked from commit c84fc4036ea9481e47687f1a212419b6f83c3c94) Signed-off-by: Mauricio Faria de Oliveira --- .gitmodules | 3 +++ src/CMakeLists.txt | 6 ++++++ src/rgw/CMakeLists.txt | 2 +- src/spawn | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) create mode 160000 src/spawn diff --git a/.gitmodules b/.gitmodules index fc961d5fb298d..08ed451fdab96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "src/c-ares"] path = src/c-ares url = https://github.com/ceph/c-ares.git +[submodule "src/spawn"] + path = src/spawn + url = https://github.com/ceph/spawn.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f6a97ba15c426..93a5290331cc5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -692,6 +692,12 @@ if(WITH_RBD) add_subdirectory(rbd_replay) endif(WITH_RBD) +if(WITH_BOOST_CONTEXT) + set(SPAWN_BUILD_TESTS OFF CACHE INTERNAL "disable building of spawn unit tests") + set(SPAWN_INSTALL OFF CACHE INTERNAL "disable installation of spawn headers") + add_subdirectory(spawn) +endif() + # RadosGW if(WITH_KVS) add_subdirectory(key_value_store) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 12f831fbd8867..b1c757d60fa7f 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -219,7 +219,7 @@ if(WITH_CURL_OPENSSL) endif() if(WITH_BOOST_CONTEXT) - target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) + target_link_libraries(rgw_a PRIVATE spawn) endif() set(rgw_libs rgw_a) diff --git a/src/spawn b/src/spawn new file mode 160000 index 0000000000000..5f4742f647a5a --- /dev/null +++ b/src/spawn @@ -0,0 +1 @@ +Subproject commit 5f4742f647a5a33b9467f648a3968b3cd0a681ee -- 2.39.5