[Pkg-ceph-commits] [ceph] 01/01: new patch to use system libjerasure

Tue Dec 9 13:29:22 UTC 2014

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 01d9d74 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Dec 9 10:30:56 2014

    new patch to use system libjerasure
---
 debian/control                           |   1 +
 debian/copyright                         |   2 +
 debian/patches/series                    |   1 +
 debian/patches/use_system_jerasure.patch | 121 +++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+)

diff --git a/debian/control b/debian/control
index eb4aab4..dd3a9c1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Build-Depends: debhelper (>= 9~), dh-systemd (>= 1.5),
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 powerpc armhf ppc64el],
 #               libgtest-dev (>= 1.6.0), cmake,
+               libjerasure-dev,
                libkeyutils-dev,
                libleveldb-dev,
                libnss3-dev,
diff --git a/debian/copyright b/debian/copyright
index 9cba12f..1d67691 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ceph
 Upstream-Contact: Sage Weil <sage at newdream.net>
 Source: http://ceph.com/
+Files-Excluded: src/erasure-code/jerasure/gf-complete
+                src/erasure-code/jerasure/jerasure
 
 Files: *
 Copyright: 2004-2014 Sage Weil <sage at newdream.net>
diff --git a/debian/patches/series b/debian/patches/series
index 6f9791d..fc11475 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,5 @@ sample.ceph.conf.patch
 tests-disable.patch
 tests-disable-ceph-disk.patch
 #use_system_gtest.patch
+use_system_jerasure.patch
 virtualenv-never-download.patch
diff --git a/debian/patches/use_system_jerasure.patch b/debian/patches/use_system_jerasure.patch
new file mode 100644
index 0000000..7962d30
--- /dev/null
+++ b/debian/patches/use_system_jerasure.patch
@@ -0,0 +1,121 @@
+Last-Update: 2014-12-09
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: use system "libjerasure" instead of bundled one.
+
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -1,50 +1,22 @@
+ # jerasure plugin
+ noinst_HEADERS += \
+-  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/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_CFLAGS = ${AM_CFLAGS} \
++    -I$(includedir)/jerasure
+ libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
+-	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+-	-I$(srcdir)/erasure-code/jerasure/jerasure/include
++    -I$(includedir)/jerasure
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -55,19 +27,17 @@
+ 	${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
++    -I$(includedir)/jerasure
+ 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
++    -I$(includedir)/jerasure
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -80,21 +50,19 @@
+ 	${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
++    -I$(includedir)/jerasure
+ 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
++    -I$(includedir)/jerasure
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -104,9 +72,9 @@
+ 	erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
+ 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} -module -avoid-version -shared
++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git

