From 4d732209af9b02ceef76a53615fb675a3ca9af3d Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 4 Nov 2015 11:05:32 +0000 Subject: [PATCH] Build internal plugins and classes as modules Erasure coding plugins and Ceph classes are never exposed outside of the Ceph codebase, so versioning the built libraries adds limited value and does not reflect actual usage. Build as un-versioned shared modules instead. --- src/cls/Makefile-server.am | 2 +- src/erasure-code/isa/Makefile.am | 2 +- src/erasure-code/jerasure/Makefile.am | 10 +++++----- src/erasure-code/lrc/Makefile.am | 2 +- src/erasure-code/shec/Makefile.am | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cls/Makefile-server.am b/src/cls/Makefile-server.am index 9b719e34c4011a..3658de4f2a4d60 100644 --- a/src/cls/Makefile-server.am +++ b/src/cls/Makefile-server.am @@ -55,7 +55,7 @@ radoslib_LTLIBRARIES += libcls_replica_log.la libcls_user_la_SOURCES = cls/user/cls_user.cc libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS) -libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*' +libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*' radoslib_LTLIBRARIES += libcls_user.la libcls_rgw_la_SOURCES = \ diff --git a/src/erasure-code/isa/Makefile.am b/src/erasure-code/isa/Makefile.am index 67725dd51572cd..7b60562309c1b4 100644 --- a/src/erasure-code/isa/Makefile.am +++ b/src/erasure-code/isa/Makefile.am @@ -67,7 +67,7 @@ libec_isa_la_CXXFLAGS = ${AM_CXXFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/inclu 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:14:0 +libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am index 9ca4fbb35d7d42..adcb95daf3457c 100644 --- a/src/erasure-code/jerasure/Makefile.am +++ b/src/erasure-code/jerasure/Makefile.am @@ -48,7 +48,7 @@ libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 +libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -70,7 +70,7 @@ libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 +libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -95,7 +95,7 @@ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 +libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -124,7 +124,7 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 +libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -138,7 +138,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) -libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 +libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif diff --git a/src/erasure-code/lrc/Makefile.am b/src/erasure-code/lrc/Makefile.am index c6547a3ea5297b..44c47d558315a4 100644 --- a/src/erasure-code/lrc/Makefile.am +++ b/src/erasure-code/lrc/Makefile.am @@ -13,7 +13,7 @@ libec_lrc_la_SOURCES = ${lrc_sources} common/str_map.cc 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 diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am index 1449a41ac23296..6b658d5a575dc5 100644 --- a/src/erasure-code/shec/Makefile.am +++ b/src/erasure-code/shec/Makefile.am @@ -50,7 +50,7 @@ libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure \ -I$(srcdir)/erasure-code/shec libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 +libec_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -76,7 +76,7 @@ libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure \ -I$(srcdir)/erasure-code/shec libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 +libec_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -105,7 +105,7 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure \ -I$(srcdir)/erasure-code/shec libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 +libec_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_shec_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -138,7 +138,7 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ -I$(srcdir)/erasure-code/jerasure \ -I$(srcdir)/erasure-code/shec libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 +libec_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_shec_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif @@ -152,7 +152,7 @@ libec_shec_la_SOURCES = \ libec_shec_la_CFLAGS = ${AM_CFLAGS} libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) -libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 +libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared if LINUX libec_shec_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif