raoul pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a01b2434054db1f7de9087634227c52abb48e291

commit a01b2434054db1f7de9087634227c52abb48e291
Author: Raoul Hecky <raoul.he...@gmail.com>
Date:   Fri Apr 24 09:12:32 2015 +0200

    ecore-con: try to load libcurl.so.5 before .so.4
    
    Curl is using a strange soname bumping where soname version is changed by 
configure when it detects some differences with off_t.
    Explanations here: http://curl.haxx.se/dev/readme-curl_off_t.html
    
    As we are not using curl_off_t in our code, we can simply load libcurl.so.5 
if present.
---
 src/lib/ecore_con/ecore_con_url.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/ecore_con/ecore_con_url.c 
b/src/lib/ecore_con/ecore_con_url.c
index 68b2a82..b41cfb2 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -309,13 +309,17 @@ _c_init(void)
          }                                    \
     }
 #if defined(_WIN32) || defined(__CYGWIN__)
+   LOAD("libcurl-5.dll"); // try correct dll first
    LOAD("libcurl-4.dll"); // try correct dll first
    LOAD("libcurl.dll"); // try 1
    LOAD("curllib.dll"); // if fail try 2
 #elif defined(__APPLE__) && defined(__MACH__)
+   LOAD("libcurl.5.dylib"); // try 1
    LOAD("libcurl.4.dylib"); // try 1
+   LOAD("libcurl.so.5"); // if fail try 2
    LOAD("libcurl.so.4"); // if fail try 2
 #else
+   LOAD("libcurl.so.5"); // try only
    LOAD("libcurl.so.4"); // try only
 #endif
    if (!_c->mod) goto error;

-- 


Reply via email to