[Pkg-ceph-commits] [ceph] 01/01: Mark new erasure coding libraries as modules, wildcard install

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch experimental
in repository ceph.

commit 82470d67a137ad2baaebcd27fd6663603cf25972
Author: James Page <james.page at ubuntu.com>
Date:   Fri Dec 5 11:43:21 2014 +0000

    Mark new erasure coding libraries as modules, wildcard install
---
 debian/ceph.install          |  4 +---
 debian/patches/modules.patch | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index a222a3c..2dbb155 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -14,9 +14,7 @@ usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/lib/*/ceph/ceph_common.sh
 usr/lib/*/ceph/ceph-osd-prestart.sh    /usr/lib/ceph/
-usr/lib/*/ceph/erasure-code/libec_jerasure*.so
-usr/lib/*/ceph/erasure-code/libec_lrc.so*
-usr/lib/*/ceph/erasure-code/libec_isa.so*
+usr/lib/*/ceph/erasure-code/libec_*.so
 usr/lib/*/rados-classes/*.so
 usr/sbin/ceph-create-keys
 usr/sbin/ceph-disk
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index 9a749cb..64fbf65 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -9,8 +9,7 @@ Description: Mark modules as actually being modules
 
 --- a/src/cls/Makefile.am
 +++ b/src/cls/Makefile.am
-@@ -44,9 +44,9 @@
- radoslib_LTLIBRARIES += libcls_replica_log.la
+@@ -45,7 +45,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
  
  libcls_user_la_SOURCES = cls/user/cls_user.cc
  libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -19,11 +18,9 @@ Description: Mark modules as actually being modules
  radoslib_LTLIBRARIES += libcls_user.la
  
  libcls_rgw_la_SOURCES = \
- 	cls/rgw/cls_rgw.cc \
 --- a/src/erasure-code/jerasure/Makefile.am
 +++ b/src/erasure-code/jerasure/Makefile.am
-@@ -42,9 +42,9 @@
- libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
+@@ -43,7 +43,7 @@ libec_jerasure_generic_la_CXXFLAGS= ${AM
  	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
  	-I$(srcdir)/erasure-code/jerasure/jerasure/include
  libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -32,9 +29,7 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
- 
-@@ -65,9 +65,9 @@
- 	${INTEL_SSSE3_FLAGS} \
+@@ -66,7 +66,7 @@ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CX
  	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
  	-I$(srcdir)/erasure-code/jerasure/jerasure/include
  libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -43,9 +38,7 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
- 
-@@ -92,9 +92,9 @@
- 	${INTEL_SSE4_2_FLAGS} \
+@@ -93,7 +93,7 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
  	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
  	-I$(srcdir)/erasure-code/jerasure/jerasure/include
  libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -54,9 +47,7 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
- 
-@@ -104,9 +104,9 @@
- 	erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
+@@ -105,7 +105,7 @@ libec_jerasure_la_SOURCES = \
  libec_jerasure_la_CFLAGS = ${AM_CFLAGS}
  libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
  libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -65,4 +56,25 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
+--- a/src/erasure-code/lrc/Makefile.am
++++ b/src/erasure-code/lrc/Makefile.am
+@@ -13,7 +13,7 @@ libec_lrc_la_SOURCES = ${lrc_sources} co
+ libec_lrc_la_CFLAGS = ${AM_CFLAGS}
+ libec_lrc_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libec_lrc_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(LIBJSON_SPIRIT)
+-libec_lrc_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
++libec_lrc_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+--- a/src/erasure-code/isa/Makefile.am
++++ b/src/erasure-code/isa/Makefile.am
+@@ -49,7 +49,7 @@ libec_isa_la_CXXFLAGS = ${AM_CXXFLAGS} -
+ libec_isa_la_CCASFLAGS = ${AM_CCASFLAGS} -I $(abs_srcdir)/erasure-code/isa/isa-l/include/
  
+ libec_isa_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:10:0
++libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git