From eeceb111d8e14ea1f20a16eaeabea42f463040bf Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 17 Jan 2017 10:39:03 -0500 Subject: [PATCH] rbd: remove direct linking to static boost libraries The boost libraries are included in libceph-common. If linked directly, boost::regex will abort during shutdown since it uses a global static variable and it will be destructed twice. Signed-off-by: Jason Dillaman --- src/tools/rbd/CMakeLists.txt | 1 - src/tools/rbd_nbd/CMakeLists.txt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt index fea7b7b50868b..d620aedfc5a1d 100644 --- a/src/tools/rbd/CMakeLists.txt +++ b/src/tools/rbd/CMakeLists.txt @@ -45,7 +45,6 @@ target_link_libraries(rbd librbd librados rbd_types journal ceph-common global - ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) if(WITH_KRBD) target_link_libraries(rbd diff --git a/src/tools/rbd_nbd/CMakeLists.txt b/src/tools/rbd_nbd/CMakeLists.txt index a339b3845fea7..d7ce811e9634f 100644 --- a/src/tools/rbd_nbd/CMakeLists.txt +++ b/src/tools/rbd_nbd/CMakeLists.txt @@ -1,4 +1,3 @@ add_executable(rbd-nbd rbd-nbd.cc) -target_link_libraries(rbd-nbd librbd librados global - ${Boost_REGEX_LIBRARY}) +target_link_libraries(rbd-nbd librbd librados global) install(TARGETS rbd-nbd DESTINATION bin) -- 2.39.5