sys-cluster/ceph: Version bump to 10.2.1 (bug #583194)

This also adds some preliminary code for unbundling dev-libs/jerasure and
dev-libs/gf-complete (bug #463326), but it is commented out for the moment
pending bugs 584056 and 584058.

This also contains fixes for bugs 583550 and 582908.

Package-Manager: portage-2.3.0_rc1

4 files changed, 643 insertions, 0 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index b575c7d513df..0ca02c7441ab 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,4 +1,5 @@
 DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512 7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9 WHIRLPOOL a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da
 DIST ceph-0.94.6.tar.gz 9131464 SHA256 d2e65e21bdecdfa1fffb2661e9be2d5382bd975a0eb8296df0e96bacc11c251f SHA512 4920857d7493769929754877e3f255cc816400757b014b0c075d65ce9c83c47a86725540fa012eb95f9c6395a477945d3a46322f3055f05345298858fec53997 WHIRLPOOL cb1a230dc1f07903b3712d9d23df718b12df219255b680737d3a746e9cbeee0d0c3ddb21da6dad1e31fb4d77aa9b3283e2dbd6e59ca38146db2ae91c5e7d4229
 DIST ceph-10.2.0.tar.gz 11667920 SHA256 1a39d919beccaa26ddfbaeac04eebb80f4d43946a59a18e2e25a9a805d5b262d SHA512 1277f08aa7f8e30d962e455d611ff21667334c27012b7a4c2e22faf0e03c0f3e3278c561ce7ea7548d065c26824e8d212b01303201d0749648b741d2a4eb0125 WHIRLPOOL 3d6e85888f74b629f67107199c4c5de5dffc2f7bdb639a24aaea8cce447710996281685623f667b95786b5218ec586ea1c0b497237ff344b857eb6cbffc28713
+DIST ceph-10.2.1.tar.gz 11697889 SHA256 f9f2f61b9d172f7ac55cde4c22564cf49d2421cdb312b0e7d191de5ab8ca8e9a SHA512 b0dfbca4ce1ebeb069455e7df068d0d3e777080f1bbf10553395106b8dbf198a74f381036c64dbe28854a221c5c5c4a0ac5eed2700b7658e829297610bcd8243 WHIRLPOOL 54c321506fc31875dfec4c4ee13335c8228ef311817cb1021694133303dd0bc9a7216aa46ad3ca529a95909b9974ece14e13db722a106f3130ed4dbc0899a07b
 DIST ceph-9.2.1.tar.gz 9933444 SHA256 1918dfc3df80df5986c5b7ff6bc6c78064eef0f6c5e8269dba30e08c703a7c2f SHA512 1e84c1e2d64f4156a523658ed11552b045f75986922b7b7dbaf4719e73a0a6aadc71eb2b94ae363526f729534a592921a437468a41a3cea88c1b84e09de8505a WHIRLPOOL 3a0eb6712e5b0235707e86129e1d66f1184f50cd4980c30f6d8cc0e7dfd96d30b91177ed16dd7abf2ad4983c6a543eb91915f74f661f7d3e3c810b5b1d656aca
diff --git a/sys-cluster/ceph/ceph-10.2.1.ebuild b/sys-cluster/ceph/ceph-10.2.1.ebuild
new file mode 100644
index 000000000000..ab79bf341a04
--- /dev/null
+++ b/sys-cluster/ceph/ceph-10.2.1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit check-reqs autotools eutils python-r1 udev user \
+	readme.gentoo-r1 systemd versionator flag-o-matic
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="
+		git://github.com/ceph/ceph.git
+		https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ceph.com/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
+IUSE+=" libatomic lttng +nss +radosgw static-libs tcmalloc test xfs zfs"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	app-arch/snappy
+	dev-libs/boost:=[threads]
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-python/sphinx[$(python_gen_usedep 'python2*')]
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	libatomic? ( dev-libs/libatomic_ops )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
+	radosgw? ( dev-libs/fcgi )
+	ldap? ( net-nds/openldap )
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		gnome-base/librsvg
+	)
+	radosgw? (
+		dev-libs/fcgi
+		dev-libs/expat
+		net-misc/curl
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	!jemalloc? ( dev-util/google-perftools )
+	lttng? ( dev-util/lttng-ust )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	app-arch/cpio
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		sys-fs/btrfs-progs
+		sys-apps/grep[pcre]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/which
+	sys-apps/hdparm
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-apps/gptfdisk
+	sys-apps/findutils
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	${PYTHON_REQUIRED_USE}
+	^^ ( nss cryptopp )
+	?? ( jemalloc tcmalloc )
+	"
+
+# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
+REQUIRED_USE+="	radosgw"
+
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
+	#"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
+	"${FILESDIR}/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch"
+)
+
+check-reqs_export_vars() {
+	if use debug; then
+		CHECKREQS_DISK_BUILD="23G"
+		CHECKREQS_DISK_USR="7G"
+	elif use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="450M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph
+	enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
+emake_python_bindings() {
+	local action="${1}" params binding
+	shift
+	params=("${@}")
+
+	__emake_python_bindings_do_impl() {
+		emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
+
+		# these don't work and aren't needed on python3
+		if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then
+			rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py
+		fi
+	}
+
+	pushd "${S}/src"
+	for binding in rados rbd $(use cephfs && echo cephfs); do
+		python_foreach_impl __emake_python_bindings_do_impl
+	done
+	popd
+
+	unset __emake_python_bindings_do_impl
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	default
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+
+	append-flags -fPIC
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-hadoop
+		--includedir=/usr/include
+		$(use_with cephfs)
+		$(use_with debug)
+		$(use_with fuse)
+		$(use_with libaio)
+		$(use_with libatomic libatomic-ops)
+		$(use_with nss)
+		$(use_with cryptopp)
+		$(use_with radosgw)
+		$(use_with gtk gtk2)
+		$(use_enable static-libs static)
+		$(use_with jemalloc)
+		$(use_with xfs libxfs)
+		$(use_with zfs libzfs)
+		$(use_with lttng )
+		$(use_with babeltrace)
+		$(use_with ldap openldap)
+		$(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
+		--with-mon
+		--with-eventfd
+		--with-cython
+		--without-kinetic
+		--without-librocksdb
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	# we can only use python2.7 for building at the moment
+	python_export python2.7 PYTHON EPYTHON
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	emake_python_bindings all
+
+	use test && emake check-local
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+src_install() {
+	default
+	emake_python_bindings install-exec "DESTDIR=\"${D}\""
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe src/init-ceph ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners ceph:ceph /var/lib/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch b/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch
new file mode 100644
index 000000000000..38d479a8e479
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch
@@ -0,0 +1,25 @@
+From 0160e50fa9b255ad338a50b97bcbb2bfa56aa93d Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Tue, 3 May 2016 10:51:54 -0500
+Subject: [PATCH] armv7l doesnt support -momit-leaf-frame-pointer
+
+---
+ src/rocksdb/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rocksdb/Makefile b/src/rocksdb/Makefile
+index c64ea36..541dbf3 100644
+--- a/src/rocksdb/Makefile
++++ b/src/rocksdb/Makefile
+@@ -84,7 +84,7 @@ endif
+ # compile with -O2 if debug level is not 2
+ ifneq ($(DEBUG_LEVEL), 2)
+ OPT += -O2 -fno-omit-frame-pointer
+-ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
++ifneq ($(MACHINE),$(filter $(MACHINE),ppc64 armv7l)) # ppc64 and armv7l doesn't support -momit-leaf-frame-pointer
+ OPT += -momit-leaf-frame-pointer
+ endif
+ endif
+-- 
+2.7.3
+
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
new file mode 100644
index 000000000000..8340b4d18bfd
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
@@ -0,0 +1,355 @@
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
+index adcb95d..8099208 100644
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -1,52 +1,17 @@
+ # jerasure plugin
+ noinst_HEADERS += \
+-  erasure-code/jerasure/gf-complete/include/gf_complete.h \
+-  erasure-code/jerasure/gf-complete/include/gf_general.h \
+-  erasure-code/jerasure/gf-complete/include/gf_int.h \
+-  erasure-code/jerasure/gf-complete/include/gf_method.h \
+-  erasure-code/jerasure/gf-complete/include/gf_rand.h \
+-  erasure-code/jerasure/gf-complete/include/gf_w16.h \
+-  erasure-code/jerasure/gf-complete/include/gf_w32.h \
+-  erasure-code/jerasure/gf-complete/include/gf_w4.h \
+-  erasure-code/jerasure/gf-complete/include/gf_w64.h \
+-  erasure-code/jerasure/gf-complete/include/gf_w8.h \
+-  erasure-code/jerasure/jerasure/include/cauchy.h \
+-  erasure-code/jerasure/jerasure/include/galois.h \
+-  erasure-code/jerasure/jerasure/include/jerasure.h \
+-  erasure-code/jerasure/jerasure/include/liberation.h \
+-  erasure-code/jerasure/jerasure/include/reed_sol.h \
+   erasure-code/jerasure/ErasureCodeJerasure.h
+ 
+ jerasure_sources = \
+   erasure-code/ErasureCode.cc \
+-  erasure-code/jerasure/jerasure/src/cauchy.c \
+-  erasure-code/jerasure/jerasure/src/galois.c \
+-  erasure-code/jerasure/jerasure/src/jerasure.c \
+-  erasure-code/jerasure/jerasure/src/liberation.c \
+-  erasure-code/jerasure/jerasure/src/reed_sol.c \
+-  erasure-code/jerasure/gf-complete/src/gf_wgen.c \
+-  erasure-code/jerasure/gf-complete/src/gf_method.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w16.c \
+-  erasure-code/jerasure/gf-complete/src/gf.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w32.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w64.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w128.c \
+-  erasure-code/jerasure/gf-complete/src/gf_general.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w4.c \
+-  erasure-code/jerasure/gf-complete/src/gf_rand.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w8.c \
+   erasure-code/jerasure/ErasureCodePluginJerasure.cc \
+   erasure-code/jerasure/ErasureCodeJerasure.cc
+ 
+ erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h
+ 
+ libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
+-libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}  \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
+-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_CFLAGS = ${AM_CFLAGS}
++libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+@@ -55,20 +20,11 @@ endif
+ 
+ erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la
+ 
+-libec_jerasure_neon_la_SOURCES = ${jerasure_sources}                                       \
+-                                  erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c  \
+-                                  erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c  \
+-                                  erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
+-                                  erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
+-                                  erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
++libec_jerasure_neon_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS}  \
+-	${ARM_NEON_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${ARM_NEON_FLAGS}
+ libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
+-	${ARM_NEON_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${ARM_NEON_FLAGS}
+ libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+-	${INTEL_SSSE3_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${INTEL_SSSE3_FLAGS}
+ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+-	${INTEL_SSSE3_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${INTEL_SSSE3_FLAGS}
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS}  \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+-	${INTEL_SSE4_2_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${INTEL_SSE4_2_FLAGS}
+ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+-	${INTEL_SSE4_2_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++	${INTEL_SSE4_2_FLAGS}
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc
+index d2b72f5..acbd172 100644
+--- a/src/erasure-code/shec/ErasureCodePluginShec.cc
++++ b/src/erasure-code/shec/ErasureCodePluginShec.cc
+@@ -71,7 +71,7 @@ public:
+ };
+ 
+ extern "C" {
+-#include "jerasure/include/galois.h"
++#include "galois.h"
+ 
+ extern gf_t *gfp_array[];
+ extern int  gfp_is_composite[];
+diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
+index 2180328..c84ffc7 100644
+--- a/src/erasure-code/shec/ErasureCodeShec.cc
++++ b/src/erasure-code/shec/ErasureCodeShec.cc
+@@ -28,8 +28,8 @@
+ #include "crush/CrushWrapper.h"
+ #include "osd/osd_types.h"
+ extern "C" {
+-#include "jerasure/include/jerasure.h"
+-#include "jerasure/include/galois.h"
++#include "jerasure.h"
++#include "galois.h"
+ 
+ extern int calc_determinant(int *matrix, int dim);
+ extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w);
+diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
+index 6b658d5..3281c60 100644
+--- a/src/erasure-code/shec/Makefile.am
++++ b/src/erasure-code/shec/Makefile.am
+@@ -4,49 +4,19 @@ shec_sources = \
+ 	erasure-code/shec/ErasureCodePluginShec.cc \
+ 	erasure-code/shec/ErasureCodeShec.cc \
+ 	erasure-code/shec/ErasureCodeShecTableCache.cc \
+-	erasure-code/shec/determinant.c \
+-	erasure-code/jerasure/jerasure/src/cauchy.c \
+-	erasure-code/jerasure/jerasure/src/galois.c \
+-	erasure-code/jerasure/jerasure/src/jerasure.c \
+-	erasure-code/jerasure/jerasure/src/liberation.c \
+-	erasure-code/jerasure/jerasure/src/reed_sol.c \
+-	erasure-code/jerasure/gf-complete/src/gf_wgen.c \
+-	erasure-code/jerasure/gf-complete/src/gf_method.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w16.c \
+-	erasure-code/jerasure/gf-complete/src/gf.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w32.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w64.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w128.c \
+-	erasure-code/jerasure/gf-complete/src/gf_general.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w4.c \
+-	erasure-code/jerasure/gf-complete/src/gf_rand.c \
+-	erasure-code/jerasure/gf-complete/src/gf_w8.c
++	erasure-code/shec/determinant.c
+ 
+ noinst_HEADERS += \
+ 	erasure-code/shec/ErasureCodeShec.h \
+-	erasure-code/shec/ErasureCodeShecTableCache.h \
+-	erasure-code/jerasure/jerasure/include/cauchy.h \
+-	erasure-code/jerasure/jerasure/include/galois.h \
+-	erasure-code/jerasure/jerasure/include/jerasure.h \
+-	erasure-code/jerasure/jerasure/include/liberation.h \
+-	erasure-code/jerasure/jerasure/include/reed_sol.h \
+-	erasure-code/jerasure/gf-complete/include/gf_int.h \
+-	erasure-code/jerasure/gf-complete/include/gf_complete.h \
+-	erasure-code/jerasure/gf-complete/include/gf_rand.h \
+-	erasure-code/jerasure/gf-complete/include/gf_method.h \
+-	erasure-code/jerasure/gf-complete/include/gf_general.h
++	erasure-code/shec/ErasureCodeShecTableCache.h
+ 
+ erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
+ 
+ libec_shec_generic_la_SOURCES = ${shec_sources}
+ libec_shec_generic_la_CFLAGS = ${AM_CFLAGS}  \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+@@ -57,22 +27,13 @@ endif
+ 
+ erasure_codelib_LTLIBRARIES += libec_shec_generic.la
+ 
+-libec_shec_neon_la_SOURCES = ${shec_sources} \
+-	erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \
+-	erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \
+-	erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
+-	erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
+-	erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
++libec_shec_neon_la_SOURCES = ${shec_sources}
+ libec_shec_neon_la_CFLAGS = ${AM_CFLAGS}  \
+ 	${ARM_NEON_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${ARM_NEON_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
+@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS}  \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+ 	${INTEL_SSE4_2_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
+@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+ 	${INTEL_SSE4_2_FLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c
+index 15b62c9..bf5d290 100755
+--- a/src/erasure-code/shec/determinant.c
++++ b/src/erasure-code/shec/determinant.c
+@@ -19,7 +19,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "jerasure/include/galois.h"
++#include "galois.h"
+ 
+ void print_matrix(int *mat, int dim)
+ {
+diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
+index bdce080..11895ae 100644
+--- a/src/test/erasure-code/Makefile.am
++++ b/src/test/erasure-code/Makefile.am
+@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code
+ unittest_erasure_code_jerasure_SOURCES = \
+ 	test/erasure-code/TestErasureCodeJerasure.cc \
+ 	${jerasure_sources}
+-unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
+-unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS)
++unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS)
+ unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+ if LINUX
+ unittest_erasure_code_jerasure_LDADD += -ldl
+@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \
+ 	test/erasure-code/TestErasureCodeShec.cc \
+ 	${shec_sources}
+ unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \
+ 	test/erasure-code/TestErasureCodeShec_all.cc \
+ 	${shec_sources}
+ unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \
+ 	test/erasure-code/TestErasureCodeShec_thread.cc \
+ 	${shec_sources}
+ unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
+@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \
+ 	test/erasure-code/TestErasureCodeShec_arguments.cc \
+ 	${shec_sources}
+ unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+ 	-I$(srcdir)/erasure-code/jerasure \
+ 	-I$(srcdir)/erasure-code/shec
+ unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)