From 3f24a7da92a77d376116fb1cd5047fa30b42088d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 20 Apr 2018 21:59:29 +0800 Subject: [PATCH] cmake: hide symbols import from other libraries in libcls_* so they will not be involved when resolving symbols. ld tries to keep a shared library around even if it fails to load it if it offers some unique symbols. in that case, the library will not be properly unloaded, and even worse it will interfere with following dlopen() calls, because it is marked with NODELETE by dlopen(). if it has some unresolved symbol and does offer some "unique" symbols required by the library to be loaded, the library will fail to load, despite the fact that the "unique" symbol is also offered by the executable. for more details, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60731 and https://sourceware.org/bugzilla/show_bug.cgi?id=14577 Fixes: http://tracker.ceph.com/issues/23517 Signed-off-by: Kefu Chai --- src/cls/CMakeLists.txt | 51 ++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt index fa6838e3a40ba..3e7b727bc906d 100644 --- a/src/cls/CMakeLists.txt +++ b/src/cls/CMakeLists.txt @@ -8,7 +8,8 @@ add_library(cls_sdk SHARED sdk/cls_sdk.cc) set_target_properties(cls_sdk PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_sdk DESTINATION ${cls_dir}) # cls_hello @@ -17,7 +18,8 @@ add_library(cls_hello SHARED ${cls_hello_srcs}) set_target_properties(cls_hello PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_hello DESTINATION ${cls_dir}) list(APPEND cls_embedded_srcs ${cls_hello_srcs}) @@ -27,7 +29,8 @@ add_library(cls_numops SHARED ${cls_numops_srcs}) set_target_properties(cls_numops PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_numops DESTINATION ${cls_dir}) set(cls_numops_client_srcs numops/cls_numops_client.cc) @@ -42,7 +45,8 @@ if (WITH_RBD) set_target_properties(cls_rbd PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_rbd DESTINATION ${cls_dir}) set(cls_rbd_client_srcs rbd/cls_rbd_client.cc rbd/cls_rbd_types.cc) @@ -58,7 +62,8 @@ add_library(cls_lock SHARED ${cls_lock_srcs}) set_target_properties(cls_lock PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_lock DESTINATION ${cls_dir}) set(cls_lock_client_srcs @@ -76,7 +81,8 @@ target_link_libraries(cls_otp oath) set_target_properties(cls_otp PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_otp DESTINATION ${cls_dir}) set(cls_otp_client_srcs @@ -96,7 +102,8 @@ target_link_libraries(cls_refcount json_spirit) set_target_properties(cls_refcount PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_refcount DESTINATION ${cls_dir}) set(cls_refcount_client_srcs @@ -112,7 +119,8 @@ add_library(cls_version SHARED ${cls_version_srcs}) set_target_properties(cls_version PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_version DESTINATION ${cls_dir}) set(cls_version_client_srcs @@ -128,7 +136,8 @@ add_library(cls_log SHARED ${cls_log_srcs}) set_target_properties(cls_log PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_log DESTINATION ${cls_dir}) set(cls_log_client_srcs log/cls_log_client.cc) @@ -142,7 +151,8 @@ add_library(cls_statelog SHARED ${cls_statelog_srcs}) set_target_properties(cls_statelog PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_statelog DESTINATION ${cls_dir}) set(cls_statelog_client_srcs statelog/cls_statelog_client.cc) @@ -156,7 +166,8 @@ add_library(cls_timeindex SHARED ${cls_timeindex_srcs}) set_target_properties(cls_timeindex PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_timeindex DESTINATION ${cls_dir}) set(cls_timeindex_client_srcs timeindex/cls_timeindex_client.cc) @@ -170,7 +181,8 @@ add_library(cls_replica_log SHARED ${cls_replica_log_srcs}) set_target_properties(cls_replica_log PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_replica_log DESTINATION ${cls_dir}) set(cls_replica_log_client_srcs @@ -187,7 +199,8 @@ add_library(cls_user SHARED ${cls_user_srcs}) set_target_properties(cls_user PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_user DESTINATION ${cls_dir}) set(cls_user_client_srcs @@ -206,7 +219,8 @@ add_library(cls_journal SHARED ${cls_journal_srcs}) set_target_properties(cls_journal PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_journal DESTINATION ${cls_dir}) set(cls_journal_client_srcs @@ -228,7 +242,8 @@ if (WITH_RADOSGW) set_target_properties(cls_rgw PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_rgw DESTINATION ${cls_dir}) set(cls_rgw_client_srcs @@ -248,7 +263,8 @@ if (WITH_CEPHFS) set_target_properties(cls_cephfs PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_cephfs DESTINATION ${cls_dir}) set(cls_cephfs_client_srcs @@ -266,7 +282,8 @@ add_library(cls_lua SHARED ${cls_lua_srcs}) set_target_properties(cls_lua PROPERTIES VERSION "1.0.0" SOVERSION "1" - INSTALL_RPATH "") + INSTALL_RPATH "" + CXX_VISIBILITY_PRESET hidden) install(TARGETS cls_lua DESTINATION ${cls_dir}) target_link_libraries(cls_lua liblua -- 2.39.5