git: add submodule for spawn library

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

diff --git a/.gitmodules b/.gitmodules
index f73ae196e19542d785c6faf536034afacd98cc6c..bd07553dc9c0cf16a90adbc8fc54dfc9fd8c4c54 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,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 bb22331d38e1b6ef100fe01de1064c934d834654..2f856611ad90cb4b6e6496f243baea9378add0b0 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -703,6 +703,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 bb2113ab04a996f3c2bd7f4363b2cc5b7d773edb..3be5bcf360261ebc379fbf9c5d04bf0efeb8ebf5 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -233,7 +233,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 (submodule)
index 0000000..5f4742f
--- /dev/null
+++ b/src/spawn
@@ -0,0 +1 @@
+Subproject commit 5f4742f647a5a33b9467f648a3968b3cd0a681ee