diff --git a/ceph.spec.in b/ceph.spec.in index a9f444b1e70a7..116d9d49d666e 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -868,7 +868,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/rados-classes/libcls_version.so* %{_libdir}/rados-classes/libcls_journal.so* %dir %{_libdir}/ceph/erasure-code -%{_libdir}/ceph/erasure-code/libec_*.so* +%{_libdir}/ceph/erasure-code/libec_jerasure.so +%{_libdir}/ceph/erasure-code/libec_jerasure_generic.so +%{_libdir}/ceph/erasure-code/libec_jerasure_sse3.so +%{_libdir}/ceph/erasure-code/libec_jerasure_sse4.so +%{_libdir}/ceph/erasure-code/libec_lrc.so +%{_libdir}/ceph/erasure-code/libec_shec.so +%{_libdir}/ceph/erasure-code/libec_shec_generic.so +%{_libdir}/ceph/erasure-code/libec_shec_sse3.so +%{_libdir}/ceph/erasure-code/libec_shec_sse4.so %dir %{_libdir}/ceph/compressor %{_libdir}/ceph/compressor/libceph_*.so* %if 0%{?_with_lttng} diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am index 3390bacfa7f93..9616c08fe858f 100644 --- a/src/erasure-code/Makefile.am +++ b/src/erasure-code/Makefile.am @@ -2,6 +2,7 @@ erasure_codelibdir = $(pkglibdir)/erasure-code erasure_codelib_LTLIBRARIES = +check_LTLIBRARIES = include erasure-code/jerasure/Makefile.am include erasure-code/lrc/Makefile.am diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am index bdce0804bfb8a..bb989477d27da 100644 --- a/src/test/erasure-code/Makefile.am +++ b/src/test/erasure-code/Makefile.am @@ -46,7 +46,7 @@ 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 +check_LTLIBRARIES += libec_example.la libec_missing_entry_point_la_SOURCES = test/erasure-code/ErasureCodePluginMissingEntryPoint.cc test/erasure-code/ErasureCodePluginMissingEntryPoint.cc: ./ceph_ver.h @@ -57,7 +57,7 @@ libec_missing_entry_point_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -sha if LINUX libec_missing_entry_point_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_missing_entry_point.la +check_LTLIBRARIES += libec_missing_entry_point.la libec_missing_version_la_SOURCES = test/erasure-code/ErasureCodePluginMissingVersion.cc libec_missing_version_la_CFLAGS = ${AM_CFLAGS} @@ -67,7 +67,7 @@ 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 +check_LTLIBRARIES += libec_missing_version.la libec_hangs_la_SOURCES = test/erasure-code/ErasureCodePluginHangs.cc test/erasure-code/ErasureCodePluginHangs.cc: ./ceph_ver.h @@ -78,7 +78,7 @@ 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 +check_LTLIBRARIES += libec_hangs.la libec_fail_to_initialize_la_SOURCES = test/erasure-code/ErasureCodePluginFailToInitialize.cc test/erasure-code/ErasureCodePluginFailToInitialize.cc: ./ceph_ver.h @@ -89,7 +89,7 @@ libec_fail_to_initialize_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shar if LINUX libec_fail_to_initialize_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_fail_to_initialize.la +check_LTLIBRARIES += libec_fail_to_initialize.la libec_fail_to_register_la_SOURCES = test/erasure-code/ErasureCodePluginFailToRegister.cc test/erasure-code/ErasureCodePluginFailToRegister.cc: ./ceph_ver.h @@ -100,7 +100,7 @@ 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 +check_LTLIBRARIES += libec_fail_to_register.la libec_test_jerasure_neon_la_SOURCES = test/erasure-code/TestJerasurePluginNEON.cc test/erasure-code/TestJerasurePluginNEON.cc: ./ceph_ver.h @@ -111,7 +111,7 @@ libec_test_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shar if LINUX libec_test_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_test_jerasure_neon.la +check_LTLIBRARIES += libec_test_jerasure_neon.la libec_test_jerasure_sse4_la_SOURCES = test/erasure-code/TestJerasurePluginSSE4.cc test/erasure-code/TestJerasurePluginSSE4.cc: ./ceph_ver.h @@ -122,7 +122,7 @@ libec_test_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shar if LINUX libec_test_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_test_jerasure_sse4.la +check_LTLIBRARIES += libec_test_jerasure_sse4.la libec_test_jerasure_sse3_la_SOURCES = test/erasure-code/TestJerasurePluginSSE3.cc test/erasure-code/TestJerasurePluginSSE3.cc: ./ceph_ver.h @@ -133,7 +133,7 @@ libec_test_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shar if LINUX libec_test_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_test_jerasure_sse3.la +check_LTLIBRARIES += libec_test_jerasure_sse3.la libec_test_jerasure_generic_la_SOURCES = test/erasure-code/TestJerasurePluginGeneric.cc test/erasure-code/TestJerasurePluginGeneric.cc: ./ceph_ver.h @@ -144,7 +144,7 @@ libec_test_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -s if LINUX libec_test_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_test_jerasure_generic.la +check_LTLIBRARIES += libec_test_jerasure_generic.la unittest_erasure_code_plugin_SOURCES = \ erasure-code/ErasureCode.cc \ @@ -322,7 +322,7 @@ 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 +check_LTLIBRARIES += libec_test_shec_neon.la libec_test_shec_sse4_la_SOURCES = test/erasure-code/TestShecPluginSSE4.cc test/erasure-code/TestShecPluginSSE4.cc: ./ceph_ver.h @@ -333,7 +333,7 @@ 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 +check_LTLIBRARIES += libec_test_shec_sse4.la libec_test_shec_sse3_la_SOURCES = test/erasure-code/TestShecPluginSSE3.cc test/erasure-code/TestShecPluginSSE3.cc: ./ceph_ver.h @@ -344,7 +344,7 @@ 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 +check_LTLIBRARIES += libec_test_shec_sse3.la libec_test_shec_generic_la_SOURCES = test/erasure-code/TestShecPluginGeneric.cc test/erasure-code/TestShecPluginGeneric.cc: ./ceph_ver.h @@ -355,7 +355,7 @@ libec_test_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -share if LINUX libec_test_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif -erasure_codelib_LTLIBRARIES += libec_test_shec_generic.la +check_LTLIBRARIES += libec_test_shec_generic.la unittest_erasure_code_example_SOURCES = \ erasure-code/ErasureCode.cc \