From 8377ac8982c8d1263a62fdd0a82719da2c213bf1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 10 Dec 2020 00:13:15 +0800 Subject: [PATCH] cmake: reorder linked libraries of crimson-alienstore 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 --- src/crimson/os/alienstore/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/crimson/os/alienstore/CMakeLists.txt b/src/crimson/os/alienstore/CMakeLists.txt index dbcd9bd87ba..03571c2724a 100644 --- a/src/crimson/os/alienstore/CMakeLists.txt +++ b/src/crimson/os/alienstore/CMakeLists.txt @@ -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 + $ + $) + +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} - $ - $) 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 -- 2.39.5