]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: build boost::context and coroutine only with rgw Beast frontend
authorNathan Cutler <ncutler@suse.com>
Tue, 23 May 2017 07:44:45 +0000 (09:44 +0200)
committerNathan Cutler <ncutler@suse.com>
Mon, 29 May 2017 20:47:44 +0000 (22:47 +0200)
boost::context is currently (1.63) unsupported for s390x and anyway
it makes sense to conditionalize Boost components so they are only
built with the Ceph components that need them (like is already being
done for mgr).

Fixes: http://tracker.ceph.com/issues/20048
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
CMakeLists.txt

index da5292a026315e6dcdbbb397cd72083aea3bfa89..fb477ba8ec61ca83bea10b6b501d686ee8e763e7 100644 (file)
@@ -513,14 +513,19 @@ endif()
 # Boost
 option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
 
+# Boost::thread depends on Boost::atomic, so list it explicitly.
 set(BOOST_COMPONENTS
-       thread system regex random program_options date_time iostreams coroutine context)
+  atomic thread system regex random program_options date_time iostreams)
 set(BOOST_HEADER_COMPONENTS container)
 
 if(WITH_MGR)
        list(APPEND BOOST_COMPONENTS python)
 endif()
 
+if(WITH_RADOSGW_BEAST_FRONTEND)
+       list(APPEND BOOST_COMPONENTS coroutine context)
+endif()
+
 if (WITH_SYSTEM_BOOST)
   if(ENABLE_SHARED)
     set(Boost_USE_STATIC_LIBS OFF)