summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Cutler <ncutler@suse.com>2016-02-19 20:24:22 +0100
committerNathan Cutler <ncutler@suse.com>2016-02-20 09:42:31 +0100
commit1b6faf68fbe272f4ded1b287453e7ab24c37b7da (patch)
treee252521f48903af2d3649cadfa06aae0e675a5cb
parentMakefile: workaround an automake bug for "make check" (diff)
downloadceph-1b6faf68fbe272f4ded1b287453e7ab24c37b7da.tar.xz
ceph-1b6faf68fbe272f4ded1b287453e7ab24c37b7da.zip
Refrain from versioning EC testing plugins
Since these plugins are only used in "make check", there is no point in versioning them. http://tracker.ceph.com/issues/14756 Fixes: #14756 Signed-off-by: Nathan Cutler <ncutler@suse.com>
-rw-r--r--src/test/erasure-code/Makefile.am70
1 files changed, 56 insertions, 14 deletions
diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index 32f4d7989e3..bdce0804bfb 100644
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -42,7 +42,10 @@ test/erasure-code/ErasureCodePluginExample.cc: ./ceph_ver.h
libec_example_la_CFLAGS = ${AM_CFLAGS}
libec_example_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_example_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_example_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_example_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_example_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_example.la
libec_missing_entry_point_la_SOURCES = test/erasure-code/ErasureCodePluginMissingEntryPoint.cc
@@ -50,14 +53,20 @@ test/erasure-code/ErasureCodePluginMissingEntryPoint.cc: ./ceph_ver.h
libec_missing_entry_point_la_CFLAGS = ${AM_CFLAGS}
libec_missing_entry_point_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_missing_entry_point_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_missing_entry_point_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_missing_entry_point.la
libec_missing_version_la_SOURCES = test/erasure-code/ErasureCodePluginMissingVersion.cc
libec_missing_version_la_CFLAGS = ${AM_CFLAGS}
libec_missing_version_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_missing_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_missing_version_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_missing_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_missing_version_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_missing_version.la
libec_hangs_la_SOURCES = test/erasure-code/ErasureCodePluginHangs.cc
@@ -65,7 +74,10 @@ test/erasure-code/ErasureCodePluginHangs.cc: ./ceph_ver.h
libec_hangs_la_CFLAGS = ${AM_CFLAGS}
libec_hangs_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_hangs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_hangs_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_hangs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_hangs_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_hangs.la
libec_fail_to_initialize_la_SOURCES = test/erasure-code/ErasureCodePluginFailToInitialize.cc
@@ -73,7 +85,10 @@ test/erasure-code/ErasureCodePluginFailToInitialize.cc: ./ceph_ver.h
libec_fail_to_initialize_la_CFLAGS = ${AM_CFLAGS}
libec_fail_to_initialize_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_fail_to_initialize_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_fail_to_initialize_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_fail_to_initialize.la
libec_fail_to_register_la_SOURCES = test/erasure-code/ErasureCodePluginFailToRegister.cc
@@ -81,7 +96,10 @@ test/erasure-code/ErasureCodePluginFailToRegister.cc: ./ceph_ver.h
libec_fail_to_register_la_CFLAGS = ${AM_CFLAGS}
libec_fail_to_register_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_fail_to_register_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_fail_to_register_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_fail_to_register_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_fail_to_register_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_fail_to_register.la
libec_test_jerasure_neon_la_SOURCES = test/erasure-code/TestJerasurePluginNEON.cc
@@ -89,7 +107,10 @@ test/erasure-code/TestJerasurePluginNEON.cc: ./ceph_ver.h
libec_test_jerasure_neon_la_CFLAGS = ${AM_CFLAGS}
libec_test_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_jerasure_neon_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_jerasure_neon.la
libec_test_jerasure_sse4_la_SOURCES = test/erasure-code/TestJerasurePluginSSE4.cc
@@ -97,7 +118,10 @@ test/erasure-code/TestJerasurePluginSSE4.cc: ./ceph_ver.h
libec_test_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS}
libec_test_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_jerasure_sse4_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_jerasure_sse4.la
libec_test_jerasure_sse3_la_SOURCES = test/erasure-code/TestJerasurePluginSSE3.cc
@@ -105,7 +129,10 @@ test/erasure-code/TestJerasurePluginSSE3.cc: ./ceph_ver.h
libec_test_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}
libec_test_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_jerasure_sse3_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_jerasure_sse3.la
libec_test_jerasure_generic_la_SOURCES = test/erasure-code/TestJerasurePluginGeneric.cc
@@ -113,7 +140,10 @@ test/erasure-code/TestJerasurePluginGeneric.cc: ./ceph_ver.h
libec_test_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}
libec_test_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_jerasure_generic_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_jerasure_generic.la
unittest_erasure_code_plugin_SOURCES = \
@@ -288,7 +318,10 @@ test/erasure-code/TestShecPluginNEON.cc: ./ceph_ver.h
libec_test_shec_neon_la_CFLAGS = ${AM_CFLAGS}
libec_test_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_shec_neon_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_shec_neon.la
libec_test_shec_sse4_la_SOURCES = test/erasure-code/TestShecPluginSSE4.cc
@@ -296,7 +329,10 @@ test/erasure-code/TestShecPluginSSE4.cc: ./ceph_ver.h
libec_test_shec_sse4_la_CFLAGS = ${AM_CFLAGS}
libec_test_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_shec_sse4_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_shec_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_shec_sse4.la
libec_test_shec_sse3_la_SOURCES = test/erasure-code/TestShecPluginSSE3.cc
@@ -304,7 +340,10 @@ test/erasure-code/TestShecPluginSSE3.cc: ./ceph_ver.h
libec_test_shec_sse3_la_CFLAGS = ${AM_CFLAGS}
libec_test_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_shec_sse3_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_shec_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_shec_sse3.la
libec_test_shec_generic_la_SOURCES = test/erasure-code/TestShecPluginGeneric.cc
@@ -312,7 +351,10 @@ test/erasure-code/TestShecPluginGeneric.cc: ./ceph_ver.h
libec_test_shec_generic_la_CFLAGS = ${AM_CFLAGS}
libec_test_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_test_shec_generic_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
-libec_test_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code_.*'
+libec_test_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+if LINUX
+libec_test_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+endif
erasure_codelib_LTLIBRARIES += libec_test_shec_generic.la
unittest_erasure_code_example_SOURCES = \