From: Nathan Cutler Date: Tue, 23 May 2017 07:44:45 +0000 (+0200) Subject: cmake: build boost::context and coroutine only with rgw Beast frontend X-Git-Tag: v12.1.0~57^2~3^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b22cde8e88cf2bc0ac8e94ef160553c20971012b;p=ceph.git cmake: build boost::context and coroutine only with rgw Beast frontend 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 Signed-off-by: Tim Serong Signed-off-by: Casey Bodley Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index da5292a02631..fb477ba8ec61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)