From 52e87d321461e3684090de397dffd8d551ade8b3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 16 Feb 2015 13:26:14 +0800 Subject: [PATCH] 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 Signed-off-by: Kefu Chai --- src/Makefile.am | 1 + src/common/Makefile.am | 11 ++--------- src/libradosstriper/Makefile.am | 2 +- src/test/Makefile.am | 3 ++- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e18205a909e74..57cccfc8ab017 100644 --- 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 a0736ba821fa1..c5d4fcdc37624 100644 --- 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 ad0ebb56b3369..770054c5fcdfc 100644 --- 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 023e797bd29b5..df505629944ca 100644 --- 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 -- 2.39.5