From: Kefu Chai <kchai@redhat.com>
Date: Tue, 19 Jul 2016 06:24:45 +0000 (+0800)
Subject: cmake: remove util.cc from lib{rados,cephfs},ceph-objectstore-tool
X-Git-Tag: v11.0.1~706^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3173d2ea12a1454302877a6563e75f499e24c5ee;p=ceph-ci.git

cmake: remove util.cc from lib{rados,cephfs},ceph-objectstore-tool

util.cc is included by both librados and libcephfs, the `lvm` static
variable in `lsb_release_parse()` will be free twice by them. this
could lead to double free issue. and util.cc is not used by client at all, so
remove it from them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72e21066852..d54cd683ed1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -748,8 +748,7 @@ add_library(parse_secret_objs OBJECT ${parse_secret_files})
 if(WITH_LIBCEPHFS)
   add_subdirectory(client)
   set(libcephfs_srcs libcephfs.cc)
-  add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs}
-    $<TARGET_OBJECTS:common_util_obj>)
+  add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
   target_link_libraries(cephfs LINK_PRIVATE client
     ${CRYPTO_LIBS} ${EXTRALIBS})
   if(ENABLE_SHARED)
diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index 7a99ef44f34..b4335a606b8 100644
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -4,7 +4,6 @@ add_library(librados_objs OBJECT
   RadosClient.cc)
 add_library(librados ${CEPH_SHARED}
   librados.cc
-  $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:librados_objs>)
 add_dependencies(librados osdc)
 if(WITH_LTTNG)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 5a0ff5cb675..a93a96add52 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -33,8 +33,7 @@ install(PROGRAMS
 
 add_executable(ceph-objectstore-tool
   ceph_objectstore_tool.cc
-  RadosDump.cc
-  $<TARGET_OBJECTS:common_util_obj>)
+  RadosDump.cc)
 target_link_libraries(ceph-objectstore-tool osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} ${CMAKE_DL_LIBS} fuse)
 install(TARGETS ceph-objectstore-tool DESTINATION bin)