From e82f437f7762b22fbae83f02dd18fc835f6f6ed6 Mon Sep 17 00:00:00 2001 From: James Page Date: Sat, 14 Nov 2015 00:16:34 +0000 Subject: Ensure ec backends can actually be loaded. Use the actual soname rather than the fully unversioned name, ensuring that systems that don't have -dev packages actually work. Signed-off-by: James Page --- src/backends/isa-l/isa_l_rs_vand.c | 2 +- src/backends/jerasure/jerasure_rs_cauchy.c | 2 +- src/backends/jerasure/jerasure_rs_vand.c | 2 +- src/backends/null/null.c | 2 +- src/backends/rs_vand/liberasurecode_rs_vand.c | 2 +- src/backends/shss/shss.c | 2 +- src/backends/xor/flat_xor_hd.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backends/isa-l/isa_l_rs_vand.c b/src/backends/isa-l/isa_l_rs_vand.c index dba1e1a..d2f740f 100644 --- a/src/backends/isa-l/isa_l_rs_vand.c +++ b/src/backends/isa-l/isa_l_rs_vand.c @@ -43,7 +43,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define ISA_L_RS_VAND_SO_NAME "libisal.dylib" #else -#define ISA_L_RS_VAND_SO_NAME "libisal.so" +#define ISA_L_RS_VAND_SO_NAME "libisal.so.2" #endif /* Forward declarations */ diff --git a/src/backends/jerasure/jerasure_rs_cauchy.c b/src/backends/jerasure/jerasure_rs_cauchy.c index b75f855..816b45d 100644 --- a/src/backends/jerasure/jerasure_rs_cauchy.c +++ b/src/backends/jerasure/jerasure_rs_cauchy.c @@ -42,7 +42,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define JERASURE_RS_CAUCHY_SO_NAME "libJerasure.dylib" #else -#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure.so" +#define JERASURE_RS_CAUCHY_SO_NAME "libJerasure.so.2" #endif /* Forward declarations */ diff --git a/src/backends/jerasure/jerasure_rs_vand.c b/src/backends/jerasure/jerasure_rs_vand.c index a30e9c7..0c337a0 100644 --- a/src/backends/jerasure/jerasure_rs_vand.c +++ b/src/backends/jerasure/jerasure_rs_vand.c @@ -42,7 +42,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define JERASURE_RS_VAND_SO_NAME "libJerasure.dylib" #else -#define JERASURE_RS_VAND_SO_NAME "libJerasure.so" +#define JERASURE_RS_VAND_SO_NAME "libJerasure.so.2" #endif /* Forward declarations */ diff --git a/src/backends/null/null.c b/src/backends/null/null.c index 767d9d0..8c7a31b 100644 --- a/src/backends/null/null.c +++ b/src/backends/null/null.c @@ -39,7 +39,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define NULL_SO_NAME "libnullcode.dylib" #else -#define NULL_SO_NAME "libnullcode.so" +#define NULL_SO_NAME "libnullcode.so.1" #endif /* Forward declarations */ struct ec_backend null; diff --git a/src/backends/rs_vand/liberasurecode_rs_vand.c b/src/backends/rs_vand/liberasurecode_rs_vand.c index e1aab68..10f3f9b 100644 --- a/src/backends/rs_vand/liberasurecode_rs_vand.c +++ b/src/backends/rs_vand/liberasurecode_rs_vand.c @@ -40,7 +40,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.dylib" #else -#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.so" +#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rs_vand.so.1" #endif /* Forward declarations */ diff --git a/src/backends/shss/shss.c b/src/backends/shss/shss.c index d6d1531..a7a8f3f 100644 --- a/src/backends/shss/shss.c +++ b/src/backends/shss/shss.c @@ -65,7 +65,7 @@ struct shss_descriptor { #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define SHSS_SO_NAME "libshss.dylib" #else -#define SHSS_SO_NAME "libshss.so" +#define SHSS_SO_NAME "libshss.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 2af60af..b597bea 100644 --- a/src/backends/xor/flat_xor_hd.c +++ b/src/backends/xor/flat_xor_hd.c @@ -41,7 +41,7 @@ #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__) #define FLAT_XOR_SO_NAME "libXorcode.dylib" #else -#define FLAT_XOR_SO_NAME "libXorcode.so" +#define FLAT_XOR_SO_NAME "libXorcode.so.1" #endif #define DEFAULT_W 32 -- cgit v1.2.1