]> git.pld-linux.org Git - packages/csync2.git/commitdiff
- add forgotten fix-sonames.patch
authorKacper Kornet <draenog@pld-linux.org>
Fri, 10 Oct 2014 15:28:36 +0000 (16:28 +0100)
committerKacper Kornet <draenog@pld-linux.org>
Fri, 10 Oct 2014 15:28:36 +0000 (16:28 +0100)
csync2-fix-sonames.patch [new file with mode: 0644]

diff --git a/csync2-fix-sonames.patch b/csync2-fix-sonames.patch
new file mode 100644 (file)
index 0000000..9557f19
--- /dev/null
@@ -0,0 +1,104 @@
+Index: csync2-2.0+git.1368794815.cf835a7/db_mysql.c
+===================================================================
+--- csync2-2.0+git.1368794815.cf835a7.orig/db_mysql.c
++++ csync2-2.0+git.1368794815.cf835a7/db_mysql.c
+@@ -53,16 +53,16 @@ static void *dl_handle;
+ static void db_mysql_dlopen(void)
+ {
+-      csync_debug(2, "Opening shared library libmysqlclient.so\n");
+-      dl_handle = dlopen("libmysqlclient.so", RTLD_LAZY);
++      csync_debug(2, "Opening shared library libmysqlclient.so.18\n");
++      dl_handle = dlopen("libmysqlclient.so.18", RTLD_LAZY);
+       if (dl_handle == NULL) {
+               csync_fatal
+-                  ("Could not open libmysqlclient.so: %s\n"
++                  ("Could not open libmysqlclient.so.18: %s\n"
+                    "Please install Mysql client library (libmysqlclient) or use other database (sqlite, postgres)\n",
+                    dlerror());
+       }
+-      csync_debug(2, "Reading symbols from shared library libmysqlclient.so\n");
++      csync_debug(2, "Reading symbols from shared library libmysqlclient.so.18\n");
+       LOOKUP_SYMBOL(dl_handle, mysql_init);
+       LOOKUP_SYMBOL(dl_handle, mysql_real_connect);
+Index: csync2-2.0+git.1368794815.cf835a7/db_postgres.c
+===================================================================
+--- csync2-2.0+git.1368794815.cf835a7.orig/db_postgres.c
++++ csync2-2.0+git.1368794815.cf835a7/db_postgres.c
+@@ -58,16 +58,16 @@ static void *dl_handle;
+ static void db_postgres_dlopen(void)
+ {
+-      csync_debug(2, "Opening shared library libpq.so\n");
++      csync_debug(2, "Opening shared library libpq.so.5\n");
+-      dl_handle = dlopen("libpq.so", RTLD_LAZY);
++      dl_handle = dlopen("libpq.so.5", RTLD_LAZY);
+       if (dl_handle == NULL) {
+               csync_fatal
+-                  ("Could not open libpq.so: %s\n"
++                  ("Could not open libpq.so.5: %s\n"
+                    "Please install postgres client library (libpg) or use other database (sqlite, mysql)\n",
+                    dlerror());
+       }
+-      csync_debug(2, "Reading symbols from shared library libpq.so\n");
++      csync_debug(2, "Reading symbols from shared library libpq.so.5\n");
+       LOOKUP_SYMBOL(dl_handle, PQconnectdb);
+       LOOKUP_SYMBOL(dl_handle, PQstatus);
+Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite.c
+===================================================================
+--- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite.c
++++ csync2-2.0+git.1368794815.cf835a7/db_sqlite.c
+@@ -56,16 +56,16 @@ static void *dl_handle;
+ static void db_sqlite3_dlopen(void)
+ {
+-      csync_debug(2, "Opening shared library libsqlite3.so\n");
++      csync_debug(2, "Opening shared library libsqlite3.so.0\n");
+-      dl_handle = dlopen("libsqlite3.so", RTLD_LAZY);
++      dl_handle = dlopen("libsqlite3.so.0", RTLD_LAZY);
+       if (dl_handle == NULL) {
+               csync_fatal
+-                  ("Could not open libsqlite3.so: %s\n"
++                  ("Could not open libsqlite3.so.0: %s\n"
+                    "Please install sqlite3 client library (libsqlite3) or use other database (postgres, mysql)\n",
+                    dlerror());
+       }
+-      csync_debug(2, "Reading symbols from shared library libsqlite3.so\n");
++      csync_debug(2, "Reading symbols from shared library libsqlite3.so.0\n");
+       LOOKUP_SYMBOL(dl_handle, sqlite3_open);
+       LOOKUP_SYMBOL(dl_handle, sqlite3_close);
+Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c
+===================================================================
+--- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite2.c
++++ csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c
+@@ -54,20 +54,17 @@ static void *dl_handle;
+ static void db_sqlite_dlopen(void)
+ {
+-      csync_debug(2, "Opening shared library libsqlite.so\n");
++      csync_debug(2, "Opening shared library libsqlite.so.0\n");
+-      dl_handle = dlopen("libsqlite.so", RTLD_LAZY);
++      dl_handle = dlopen("libsqlite.so.0", RTLD_LAZY);
+       if (dl_handle == NULL) {
+-              csync_debug(1, "Libsqlite.so not found, trying libsqlite.so.0\n");
+-              dl_handle = dlopen("libsqlite.so.0", RTLD_LAZY);
+-              if (dl_handle == NULL) {
+                       csync_fatal
+-                          ("Could not open libsqlite.so: %s\n"
++                          ("Could not open libsqlite.so.0: %s\n"
+                            "Please install sqlite client library (libsqlite) or use other database (postgres, mysql)\n",
+                            dlerror());
+               }
+       }
+-      csync_debug(2, "Opening shared library libsqlite.so\n");
++      csync_debug(2, "Opening shared library libsqlite.so.0\n");
+       LOOKUP_SYMBOL(dl_handle, sqlite_open);
+       LOOKUP_SYMBOL(dl_handle, sqlite_close);
This page took 0.079852 seconds and 4 git commands to generate.