summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--README.md9
-rw-r--r--include/erasurecode/erasurecode_version.h6
-rw-r--r--roles/install_isal/tasks/main.yaml2
-rw-r--r--src/backends/isa-l/isa_l_rs_cauchy.c4
-rw-r--r--src/backends/isa-l/isa_l_rs_vand.c4
-rw-r--r--src/backends/jerasure/jerasure_rs_cauchy.c4
-rw-r--r--src/backends/jerasure/jerasure_rs_vand.c4
-rw-r--r--src/backends/null/null.c4
-rw-r--r--src/backends/phazrio/libphazr.c4
-rw-r--r--src/backends/rs_vand/liberasurecode_rs_vand.c4
-rw-r--r--src/backends/shss/shss.c4
-rw-r--r--src/backends/xor/flat_xor_hd.c4
13 files changed, 43 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 30f0fa4..e1ba6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Release 1.6.3
+-------------
+
+ . Fixed an underflow error when using flat_xor_hd.
+ . Added a build option to allow a suffix to be added to library names passed
+ to dlopen(). To use, define LIBERASURECODE_SO_SUFFIX via CFLAGS when
+ building. This is useful when renaming libraries for PyEClib wheels, for
+ example, so they don't conflict with system packages that may be installed.
+
Release 1.6.2
-------------
@@ -94,7 +103,7 @@ Release 1.0.9
. Minor bugfixes including removing offending MAJOR/MINOR version macros
. Enforce upper limit 32 on the number of erasure coding fragments
- (#data + #chunks) < 32
+ (#data + #chunks) < 32
Release 1.0.8
-------------
diff --git a/README.md b/README.md
index bb8469c..5c80211 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,15 @@ top-level directory:
----
+Getting Help
+============
+
+- Bugs: https://bugs.launchpad.net/liberasurecode/
+- Mailing List: http://lists.openstack.org/pipermail/openstack-discuss/ (use tag `[swift][liberasurecode]`)
+- IRC: #openstack-swift on OFTC
+
+----
+
References
==========
diff --git a/include/erasurecode/erasurecode_version.h b/include/erasurecode/erasurecode_version.h
index 21a511b..5f06cd7 100644
--- a/include/erasurecode/erasurecode_version.h
+++ b/include/erasurecode/erasurecode_version.h
@@ -27,11 +27,15 @@
#define _MAJOR 1
#define _MINOR 6
-#define _REV 2
+#define _REV 3
#define _VERSION(x, y, z) ((x << 16) | (y << 8) | (z))
#define LIBERASURECODE_VERSION _VERSION(_MAJOR, _MINOR, _REV)
+#ifndef LIBERASURECODE_SO_SUFFIX
+#define LIBERASURECODE_SO_SUFFIX ""
+#endif // LIBERASURECODE_SO_SUFFIX
+
#endif // _ERASURECODE_VERSION_H_
diff --git a/roles/install_isal/tasks/main.yaml b/roles/install_isal/tasks/main.yaml
index 34d086b..6dd8a99 100644
--- a/roles/install_isal/tasks/main.yaml
+++ b/roles/install_isal/tasks/main.yaml
@@ -23,7 +23,7 @@
set -e
set -x
cd $WORKSPACE
- git clone git://github.com/intel/isa-l.git -b v2.30.0
+ git clone https://github.com/intel/isa-l.git -b v2.30.0
cd isa-l
./autogen.sh
./configure
diff --git a/src/backends/isa-l/isa_l_rs_cauchy.c b/src/backends/isa-l/isa_l_rs_cauchy.c
index 3ab927e..2c9e117 100644
--- a/src/backends/isa-l/isa_l_rs_cauchy.c
+++ b/src/backends/isa-l/isa_l_rs_cauchy.c
@@ -38,9 +38,9 @@
#define ISA_L_RS_CAUCHY_LIB_VER_STR "2.14"
#define ISA_L_RS_CAUCHY_LIB_NAME "isa_l_rs_cauchy"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define ISA_L_RS_CAUCHY_SO_NAME "libisal.dylib"
+#define ISA_L_RS_CAUCHY_SO_NAME "libisal" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define ISA_L_RS_CAUCHY_SO_NAME "libisal.so.2"
+#define ISA_L_RS_CAUCHY_SO_NAME "libisal" LIBERASURECODE_SO_SUFFIX ".so.2"
#endif
/* Forward declarations */
diff --git a/src/backends/isa-l/isa_l_rs_vand.c b/src/backends/isa-l/isa_l_rs_vand.c
index ca176cb..6e65747 100644
--- a/src/backends/isa-l/isa_l_rs_vand.c
+++ b/src/backends/isa-l/isa_l_rs_vand.c
@@ -37,9 +37,9 @@
#define ISA_L_RS_VAND_LIB_VER_STR "2.13"
#define ISA_L_RS_VAND_LIB_NAME "isa_l_rs_vand"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define ISA_L_RS_VAND_SO_NAME "libisal.dylib"
+#define ISA_L_RS_VAND_SO_NAME "libisal" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define ISA_L_RS_VAND_SO_NAME "libisal.so.2"
+#define ISA_L_RS_VAND_SO_NAME "libisal" LIBERASURECODE_SO_SUFFIX ".so.2"
#endif
/* Forward declarations */
diff --git a/src/backends/jerasure/jerasure_rs_cauchy.c b/src/backends/jerasure/jerasure_rs_cauchy.c
index 82d796a..793504a 100644
--- a/src/backends/jerasure/jerasure_rs_cauchy.c
+++ b/src/backends/jerasure/jerasure_rs_cauchy.c
@@ -40,9 +40,9 @@
#define JERASURE_RS_CAUCHY_LIB_VER_STR "2.0"
#define JERASURE_RS_CAUCHY_LIB_NAME "jerasure_rs_cauchy"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure.dylib"
+#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure.so.2"
+#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure" LIBERASURECODE_SO_SUFFIX ".so.2"
#endif
/* Forward declarations */
diff --git a/src/backends/jerasure/jerasure_rs_vand.c b/src/backends/jerasure/jerasure_rs_vand.c
index 9395046..c2676ee 100644
--- a/src/backends/jerasure/jerasure_rs_vand.c
+++ b/src/backends/jerasure/jerasure_rs_vand.c
@@ -40,9 +40,9 @@
#define JERASURE_RS_VAND_LIB_VER_STR "2.0"
#define JERASURE_RS_VAND_LIB_NAME "jerasure_rs_vand"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define JERASURE_RS_VAND_SO_NAME "libJerasure.dylib"
+#define JERASURE_RS_VAND_SO_NAME "libJerasure" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define JERASURE_RS_VAND_SO_NAME "libJerasure.so.2"
+#define JERASURE_RS_VAND_SO_NAME "libJerasure" LIBERASURECODE_SO_SUFFIX ".so.2"
#endif
/* Forward declarations */
diff --git a/src/backends/null/null.c b/src/backends/null/null.c
index abc925b..85aa8fe 100644
--- a/src/backends/null/null.c
+++ b/src/backends/null/null.c
@@ -37,9 +37,9 @@
#define NULL_LIB_VER_STR "1.0"
#define NULL_LIB_NAME "null"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define NULL_SO_NAME "libnullcode.dylib"
+#define NULL_SO_NAME "libnullcode" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define NULL_SO_NAME "libnullcode.so.1"
+#define NULL_SO_NAME "libnullcode" LIBERASURECODE_SO_SUFFIX ".so.1"
#endif
/* Forward declarations */
struct ec_backend null;
diff --git a/src/backends/phazrio/libphazr.c b/src/backends/phazrio/libphazr.c
index 41ed74e..0dfd1fb 100644
--- a/src/backends/phazrio/libphazr.c
+++ b/src/backends/phazrio/libphazr.c
@@ -39,9 +39,9 @@
#define LIBPHAZR_LIB_VER_STR "1.0.0"
#define LIBPHAZR_LIB_NAME "libphazr"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define LIBPHAZR_SO_NAME "libphazr.dylib"
+#define LIBPHAZR_SO_NAME "libphazr" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define LIBPHAZR_SO_NAME "libphazr.so.1"
+#define LIBPHAZR_SO_NAME "libphazr" LIBERASURECODE_SO_SUFFIX ".so.1"
#endif
/* Forward declarations */
diff --git a/src/backends/rs_vand/liberasurecode_rs_vand.c b/src/backends/rs_vand/liberasurecode_rs_vand.c
index cc84b65..c17dde1 100644
--- a/src/backends/rs_vand/liberasurecode_rs_vand.c
+++ b/src/backends/rs_vand/liberasurecode_rs_vand.c
@@ -38,9 +38,9 @@
#define LIBERASURECODE_RS_VAND_LIB_VER_STR "1.0"
#define LIBERASURECODE_RS_VAND_LIB_NAME "liberasurecode_rs_vand"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.dylib"
+#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.so.1"
+#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand" LIBERASURECODE_SO_SUFFIX ".so.1"
#endif
/* Forward declarations */
diff --git a/src/backends/shss/shss.c b/src/backends/shss/shss.c
index 51622f2..75e24b6 100644
--- a/src/backends/shss/shss.c
+++ b/src/backends/shss/shss.c
@@ -63,9 +63,9 @@ struct shss_descriptor {
#define SHSS_LIB_VER_STR "1.0"
#define SHSS_LIB_NAME "shss"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define SHSS_SO_NAME "libshss.dylib"
+#define SHSS_SO_NAME "libshss" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define SHSS_SO_NAME "libshss.so.1"
+#define SHSS_SO_NAME "libshss" LIBERASURECODE_SO_SUFFIX ".so.1"
#endif
#define DEFAULT_W 128
#define METADATA 32
diff --git a/src/backends/xor/flat_xor_hd.c b/src/backends/xor/flat_xor_hd.c
index dbc1d7f..62a1bd9 100644
--- a/src/backends/xor/flat_xor_hd.c
+++ b/src/backends/xor/flat_xor_hd.c
@@ -39,9 +39,9 @@
#define FLAT_XOR_LIB_VER_STR "1.0"
#define FLAT_XOR_LIB_NAME "flat_xor_hd"
#if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define FLAT_XOR_SO_NAME "libXorcode.dylib"
+#define FLAT_XOR_SO_NAME "libXorcode" LIBERASURECODE_SO_SUFFIX ".dylib"
#else
-#define FLAT_XOR_SO_NAME "libXorcode.so.1"
+#define FLAT_XOR_SO_NAME "libXorcode" LIBERASURECODE_SO_SUFFIX ".so.1"
#endif
#define DEFAULT_W 32
View Lorry Controller Status