Correctly mark library modules

Mark RADOS class libraries as module so that they will be automatically
ignored when stripping binaries.

Signed-off-by: James Page <james.page@ubuntu.com>

diff --git a/debian/rules b/debian/rules
index f35e6c2601c0592ef2d999bc7fa022db3675bda6..88b2b3df5e82469c9066640cc9663df47f9c4d39 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ binary-arch: build install
        dh_lintian -a
        dh_link -a
 
-       dh_strip -pceph --dbg-package=ceph-dbg -k --exclude=libcls_
+       dh_strip -pceph --dbg-package=ceph-dbg
        dh_strip -pceph-mds --dbg-package=ceph-mds-dbg
        dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
        dh_strip -prbd-fuse --dbg-package=rbd-fuse-dbg
@@ -142,7 +142,7 @@ binary-arch: build install
 
        dh_compress -a
        dh_fixperms -a
-       dh_makeshlibs -a -X/usr/lib/rados-classes # exclude .so files in ceph package
+       dh_makeshlibs -a
        dh_python2 -a
        dh_installdeb -a
        dh_shlibdeps -a

diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am
index 2d3d43cb1e364aaa94252b24e875076889ac2888..f49d49def49cf43f1dfd29ff73fc20f7aca2b54f 100644 (file)
--- a/src/cls/Makefile.am
+++ b/src/cls/Makefile.am
@@ -2,17 +2,17 @@
 
 libcls_hello_la_SOURCES = cls/hello/cls_hello.cc
 libcls_hello_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_hello.la
 
 libcls_rbd_la_SOURCES = cls/rbd/cls_rbd.cc
 libcls_rbd_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_rbd.la
 
 libcls_lock_la_SOURCES = cls/lock/cls_lock.cc
 libcls_lock_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_lock.la
 
 libcls_refcount_la_SOURCES = \
@@ -20,27 +20,27 @@ libcls_refcount_la_SOURCES = \
        cls/refcount/cls_refcount_ops.cc \
        common/ceph_json.cc 
 libcls_refcount_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_refcount.la
 
 libcls_version_la_SOURCES = cls/version/cls_version.cc
 libcls_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_version.la
 
 libcls_log_la_SOURCES = cls/log/cls_log.cc
 libcls_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_log.la
 
 libcls_statelog_la_SOURCES = cls/statelog/cls_statelog.cc
 libcls_statelog_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_statelog.la
 
 libcls_replica_log_la_SOURCES = cls/replica_log/cls_replica_log.cc
 libcls_replica_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_replica_log.la
 
 libcls_rgw_la_SOURCES = \
@@ -49,7 +49,7 @@ libcls_rgw_la_SOURCES = \
        cls/rgw/cls_rgw_types.cc \
        common/ceph_json.cc
 libcls_rgw_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
-libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
+libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_rgw.la
 
 ## Rados object client classes