]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: reorder linked libraries of crimson-alienstore
authorKefu Chai <kchai@redhat.com>
Wed, 9 Dec 2020 16:13:15 +0000 (00:13 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 10 Dec 2020 09:22:04 +0000 (17:22 +0800)
so the libraries like libkv can access the symbols exposed by
crimson-alien-common.

this change should address the link failures like:

/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/16.0.0-8049-g1ab93e4d/rpm/el8/BUILD/ceph-16.0.0-8049-g1ab93e4d/src/common/PriorityCache.cc:175:
undefined reference to `ceph::common::PerfCountersBuilder::~PerfCountersBuilder()'

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/alienstore/CMakeLists.txt

index dbcd9bd87ba5140982f0ba529a82af120ebe329d..03571c2724af3f03a2d0eeb2ecdcb06c84f3bd21 100644 (file)
@@ -1,9 +1,6 @@
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rocksdb/include")
-set(crimson_alien_srcs
-    alien_store.cc
-    thread_pool.cc)
 
-list(APPEND crimson_alien_srcs
+add_library(crimson-alien-common STATIC
   ${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc
   ${PROJECT_SOURCE_DIR}/src/common/blkdev.cc
   ${PROJECT_SOURCE_DIR}/src/common/ceph_context.cc
@@ -26,6 +23,12 @@ list(APPEND crimson_alien_srcs
   ${PROJECT_SOURCE_DIR}/src/common/util.cc
   ${PROJECT_SOURCE_DIR}/src/crush/CrushLocation.cc
   ${PROJECT_SOURCE_DIR}/src/global/global_context.cc
+  $<TARGET_OBJECTS:compressor_objs>
+  $<TARGET_OBJECTS:common_prioritycache_obj>)
+
+add_library(crimson-alienstore STATIC
+  alien_store.cc
+  thread_pool.cc
   ${PROJECT_SOURCE_DIR}/src/os/ObjectStore.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/Allocator.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/AvlAllocator.cc
@@ -40,10 +43,6 @@ list(APPEND crimson_alien_srcs
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/HybridAllocator.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/StupidAllocator.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/BitmapAllocator.cc)
-
-add_library(crimson-alienstore STATIC ${crimson_alien_srcs}
-  $<TARGET_OBJECTS:compressor_objs>
-  $<TARGET_OBJECTS:common_prioritycache_obj>)
 if(WITH_LTTNG)
   add_dependencies(crimson-alienstore bluestore-tp)
 endif()
@@ -54,6 +53,7 @@ target_link_libraries(crimson-alienstore
   fmt::fmt
   kv
   heap_profiler
+  crimson-alien-common
   ${BLKID_LIBRARIES}
   ${UDEV_LIBRARIES}
   crimson