From 055fcaace586ee313ed2258ddcc1db8e677a070f Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Tue, 12 Jan 2016 00:27:49 +0800
Subject: [PATCH] erasure-code: create an internal isa lib for testing

we were linking against a '--module' shared library using its
.la file, which is not portable on some platforms accroding to
autotools. so instead of linking against the plugin so, a dedicated
internal library "libisa.la" is created for testing. and it is added
to the libec_isa.so also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/erasure-code/isa/Makefile.am  | 15 ++++++++-------
 src/test/erasure-code/Makefile.am |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/erasure-code/isa/Makefile.am b/src/erasure-code/isa/Makefile.am
index 7b60562309c..6bbb37cd8da 100644
--- a/src/erasure-code/isa/Makefile.am
+++ b/src/erasure-code/isa/Makefile.am
@@ -60,17 +60,18 @@ isa_sources = \
 
 erasure-code/isa/ErasureCodePluginIsa.cc: ./ceph_ver.h
 
-libec_isa_la_SOURCES = ${isa_sources}
+noinst_LTLIBRARIES += libisa.la
+libisa_la_SOURCES = ${isa_sources}
+libisa_la_CFLAGS = ${AM_CFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/
+libisa_la_CXXFLAGS = ${AM_CXXFLAGS}
+libisa_la_CCASFLAGS = ${AM_CCASFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/
+libisa_la_LIBTOOLFLAGS = --tag=CC
 
-libec_isa_la_CFLAGS = ${AM_CFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/
-libec_isa_la_CXXFLAGS = ${AM_CXXFLAGS} -I $(srcdir)/erasure-code/isa/isa-l/include/
-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_SOURCES =
+libec_isa_la_LIBADD = libisa.la $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
 libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
 if LINUX
 libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
 endif
-libec_isa_la_LIBTOOLFLAGS = --tag=CC
 
 erasure_codelib_LTLIBRARIES += libec_isa.la
diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
index ed0a014eccf..32f4d7989e3 100644
--- a/src/test/erasure-code/Makefile.am
+++ b/src/test/erasure-code/Makefile.am
@@ -162,7 +162,7 @@ unittest_erasure_code_isa_SOURCES = \
 	erasure-code/ErasureCode.cc \
 	test/erasure-code/TestErasureCodeIsa.cc
 unittest_erasure_code_isa_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
-unittest_erasure_code_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) .libs/libec_isa.la $(LIBERASURE_CODE)
+unittest_erasure_code_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) libisa.la $(LIBERASURE_CODE)
 if LINUX
 unittest_erasure_code_isa_LDADD += -ldl
 endif
@@ -172,7 +172,7 @@ unittest_erasure_code_plugin_isa_SOURCES = \
 	erasure-code/ErasureCode.cc \
 	test/erasure-code/TestErasureCodePluginIsa.cc
 unittest_erasure_code_plugin_isa_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
-unittest_erasure_code_plugin_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) .libs/libec_isa.la $(LIBERASURE_CODE)
+unittest_erasure_code_plugin_isa_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBERASURE_CODE)
 if LINUX
 unittest_erasure_code_plugin_isa_LDADD += -ldl
 endif
-- 
2.39.5