From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 6 Nov 2019 20:55:46 +0000 (-0500)
Subject: git: add submodule for spawn library
X-Git-Tag: v15.1.0~249^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c84fc4036ea9481e47687f1a212419b6f83c3c94;p=ceph-ci.git

git: add submodule for spawn library

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

diff --git a/.gitmodules b/.gitmodules
index f73ae196e19..bd07553dc9c 100644
--- 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 bb22331d38e..2f856611ad9 100644
--- 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 bb2113ab04a..3be5bcf3602 100644
--- 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
index 00000000000..5f4742f647a
--- /dev/null
+++ b/src/spawn
@@ -0,0 +1 @@
+Subproject commit 5f4742f647a5a33b9467f648a3968b3cd0a681ee