From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 17 Jan 2017 15:39:03 +0000 (-0500)
Subject: rbd: remove direct linking to static boost libraries
X-Git-Tag: v12.0.0~157^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12962%2Fhead;p=ceph.git

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 <dillaman@redhat.com>
---

diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
index fea7b7b50868..d620aedfc5a1 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 a339b3845fea..d7ce811e9634 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)