From: Noah Watkins <noahwatkins@gmail.com>
Date: Mon, 30 Dec 2013 20:14:02 +0000 (-0800)
Subject: make: avoid symbol exporting for C++ libs on non-Linux
X-Git-Tag: v0.75~14^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b77533404d9e0f300c311f131b02ee14fb2aa93;p=ceph.git

make: avoid symbol exporting for C++ libs on non-Linux

This removes export-symbol-regex for installed libraries with C++
interfaces on non-Linux where the hidden symbols are not resolved. This
is a temporary fix.

See ceph-devel topic "Shared library symbol visibility" for discussion
about a perm solution.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/librados/Makefile.am b/src/librados/Makefile.am
index 6efa841d46c1..23e9167fe4c7 100644
--- a/src/librados/Makefile.am
+++ b/src/librados/Makefile.am
@@ -9,7 +9,10 @@ librados_la_CXXFLAGS = ${AM_CXXFLAGS}
 
 LIBRADOS_DEPS += libcls_lock_client.la $(LIBOSDC) $(LIBCOMMON)
 librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
-librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
+librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
+if LINUX
+librados_la_LDFLAGS += -export-symbols-regex '^rados_.*'
+endif
 lib_LTLIBRARIES += librados.la
 
 noinst_HEADERS += \
diff --git a/src/librbd/Makefile.am b/src/librbd/Makefile.am
index d4e2455c8c19..0a3600da3a24 100644
--- a/src/librbd/Makefile.am
+++ b/src/librbd/Makefile.am
@@ -10,7 +10,10 @@ librbd_la_LIBADD = \
 	$(LIBRADOS) $(LIBOSDC) \
 	libcls_rbd_client.la libcls_lock_client.la \
 	$(PTHREAD_LIBS) $(EXTRALIBS)
-librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^rbd_.*'
+librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
+if LINUX
+librbd_la_LDFLAGS += -export-symbols-regex '^rbd_.*'
+endif
 lib_LTLIBRARIES += librbd.la
 
 noinst_HEADERS += \
diff --git a/src/osd/ErasureCodePluginJerasure/Makefile.am b/src/osd/ErasureCodePluginJerasure/Makefile.am
index b31fb1c0785b..85179ead1c7d 100644
--- a/src/osd/ErasureCodePluginJerasure/Makefile.am
+++ b/src/osd/ErasureCodePluginJerasure/Makefile.am
@@ -17,6 +17,9 @@ noinst_HEADERS += \
 libec_jerasure_la_CFLAGS = ${AM_CFLAGS} 
 libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS} 
 libec_jerasure_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__erasure_code_.*'
+libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
+if LINUX
+libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
 
 erasure_codelib_LTLIBRARIES += libec_jerasure.la