msg/xio: fix build with '--enable-xio'

* do not hide the symbols in buffer.cc, as XioMessenger.cc is referencing
  get_xio_mp().
* do not export private symbols from libcephfs.

Fixes: #10735
Co-authored-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index e18205a909e741d9cd2291bbbf2eef6ff690367d..57cccfc8ab017b04635ac6412260e2ed52de16d6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,7 @@ endif # WITH_FUSE
 libcephfs_la_SOURCES = libcephfs.cc
 libcephfs_la_LIBADD = $(LIBCLIENT) $(LIBCOMMON) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
 libcephfs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
+libcephfs_la_LDFLAGS += -Xcompiler -Xlinker -Xcompiler '--exclude-libs=libcommon.a'
 lib_LTLIBRARIES += libcephfs.la
 
 # jni library (java source is in src/java)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a0736ba821fa1ae3d70c0b5411c5d333068138cf..c5d4fcdc3762494b71fcc4939ed77a4a1b381625 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -97,13 +97,6 @@ libcommon_internal_la_SOURCES += \
 LIBCOMMON_DEPS += libcommon_internal.la
 noinst_LTLIBRARIES += libcommon_internal.la
 
-libcommon_api_la_SOURCES = \
-       common/buffer.cc
-if LINUX
-libcommon_api_la_CXXFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden
-endif # LINUX
-noinst_LTLIBRARIES += libcommon_api.la
-
 # inject crc in common
 libcommon_crc_la_SOURCES = \
        common/sctp_crc32.c \
@@ -135,8 +128,8 @@ if LINUX
 LIBCOMMON_DEPS += -lrt
 endif # LINUX
 
-libcommon_la_SOURCES =
-libcommon_la_LIBADD = $(LIBCOMMON_DEPS) libcommon_api.la
+libcommon_la_SOURCES = common/buffer.cc
+libcommon_la_LIBADD = $(LIBCOMMON_DEPS)
 noinst_LTLIBRARIES += libcommon.la
 
 noinst_HEADERS += \

diff --git a/src/libradosstriper/Makefile.am b/src/libradosstriper/Makefile.am
index ad0ebb56b3369b59f0be94cd8f9f03f6c31cda42..770054c5fcdfcfa14029c18d694ff504500ab151 100644 (file)
--- a/src/libradosstriper/Makefile.am
+++ b/src/libradosstriper/Makefile.am
@@ -6,7 +6,7 @@ libradosstriper_la_SOURCES = \
 # We need this to avoid basename conflicts with the libradosstriper build tests in test/Makefile.am
 libradosstriper_la_CXXFLAGS = ${AM_CXXFLAGS}
 
-LIBRADOSSTRIPER_DEPS = $(LIBRADOS_DEPS)
+LIBRADOSSTRIPER_DEPS = $(LIBRADOS_DEPS) librados_api.la
 libradosstriper_la_LIBADD = $(LIBRADOSSTRIPER_DEPS)
 libradosstriper_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
 if LINUX

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 023e797bd29b5b1ec178ab83f9ee44330e4f4a74..df505629944caf3110f142d4de91e9b3f2435a57 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -731,7 +731,8 @@ ceph_test_cls_rgw_opstate_LDADD = \
        -lcurl -luuid -lexpat \
        libcls_version_client.a libcls_log_client.a \
        libcls_statelog_client.a libcls_refcount_client.la \
-       libcls_rgw_client.la libcls_user_client.a libcls_lock_client.la
+       libcls_rgw_client.la libcls_user_client.a libcls_lock_client.la \
+       $(LIBRADOS)
 ceph_test_cls_rgw_opstate_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph_test_cls_rgw_opstate
 endif # WITH_RADOSGW