From 5e74a83a971b087e1bf3005322c07dfcb61cc4b0 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Thu, 29 Jul 2021 21:34:31 +0530 Subject: [PATCH] rgw/dbstore: Fix library link issues Now that rgw_common is no more linked with rgw_a library (commit#7b61667), dbstore (rgw_sal_dbstore) should be linked directly to rgw_common. Signed-off-by: Soumya Koduri --- src/rgw/CMakeLists.txt | 12 ++++-------- src/rgw/store/dbstore/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index de7859e904a2..9d5741149c39 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -232,6 +232,10 @@ if(WITH_JAEGER) add_dependencies(rgw_common jaegertracing::libjaegertracing) endif() +if(WITH_RADOSGW_DBSTORE) + target_link_libraries(rgw_common PRIVATE global dbstore) +endif() + set(rgw_a_srcs rgw_auth_keystone.cc rgw_client_io.cc @@ -299,10 +303,6 @@ set(rgw_libs rgw_a) list(APPEND rgw_libs ${LUA_LIBRARIES}) -if(WITH_RADOSGW_DBSTORE) - target_link_libraries(rgw_a PRIVATE dbstore) -endif() - set(rgw_schedulers_srcs rgw_dmclock_scheduler_ctx.cc rgw_dmclock_sync_scheduler.cc @@ -335,7 +335,6 @@ target_link_libraries(radosgw if(WITH_RADOSGW_BEAST_OPENSSL) # used by rgw_asio_frontend.cc target_link_libraries(radosgw PRIVATE OpenSSL::SSL) - target_link_libraries(rgw_a PRIVATE OpenSSL::SSL) endif() set_target_properties(radosgw PROPERTIES OUTPUT_NAME radosgw VERSION 2.0.0 SOVERSION 2) @@ -423,13 +422,10 @@ target_link_libraries(rgw if(WITH_RADOSGW_AMQP_ENDPOINT) target_link_libraries(rgw PRIVATE RabbitMQ::RabbitMQ) target_link_libraries(rgw PRIVATE OpenSSL::SSL) - target_link_libraries(rgw_a PRIVATE RabbitMQ::RabbitMQ) - target_link_libraries(rgw_a PRIVATE OpenSSL::SSL) endif() if(WITH_RADOSGW_KAFKA_ENDPOINT) target_link_libraries(rgw PRIVATE RDKafka::RDKafka) - target_link_libraries(rgw_a PRIVATE RDKafka::RDKafka) endif() target_link_libraries(rgw PRIVATE ${LUA_LIBRARIES}) diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt index 984fb93cfd4e..12b641673c7a 100644 --- a/src/rgw/store/dbstore/CMakeLists.txt +++ b/src/rgw/store/dbstore/CMakeLists.txt @@ -27,7 +27,7 @@ IF(USE_SQLITE) add_subdirectory(sqlite) set(CMAKE_INCLUDE_DIR ${CMAKE_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/sqlite") add_compile_definitions(SQLITE_ENABLED=1) - set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} rgw_a) + set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} rgw_common) set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} sqlite_db) add_dependencies(sqlite_db dbstore_lib) ENDIF() -- 2.47.3