File 0001-unixODBC-changed-soname-to-.2-so-reflect-i... of Package libreoffice

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch of Package libreoffice (Revision 0975b6fa103034b9f1e54d7d7d7bd4bb)

Currently displaying revision 0975b6fa103034b9f1e54d7d7d7bd4bb , Show latest

From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 5 Jan 2017 16:06:10 +0100
Subject: [PATCH] unixODBC changed soname to .2 so reflect it

we dlopen this library and thus we should be able to find it with any
soname, so far .1 and .2 seem to be used.

Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280
---
 dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index cd1b583e1840..163fc8549d06 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -38,6 +38,7 @@
 #ifdef MACOSX
 #define ODBC_LIBRARY        "libiodbc.dylib"
 #else
+#define ODBC_LIBRARY_2      "libodbc.so.2"
 #define ODBC_LIBRARY_1      "libodbc.so.1"
 #define ODBC_LIBRARY        "libodbc.so"
 #endif
@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration()
     if ( !bLoaded )
         bLoaded = load(ODBC_LIBRARY_1);
 #endif
+#ifdef ODBC_LIBRARY_2
+    if ( !bLoaded )
+        bLoaded = load(ODBC_LIBRARY_2);
+#endif
 
     if ( bLoaded )
     {
-- 
2.11.0

Places

File 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch of Package libreoffice (Revision 0975b6fa103034b9f1e54d7d7d7bd4bb)

Places