1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Description: Build without iODBC
Add support for soprano to link directly against virtodbc_r.so instead of
using the libiodbc driver manager. Given that virtuoso is hard-coded as
the driver, the use of a driver manager is an unnecessary indirection; and
the manner of the hard-coding makes it harder than it ought to be to
switch from iODBC to UnixODBC - so just eliminate the DM entirely.
.
This does mean we're using an rpath, but that's a lesser evil given that
the path to the library is otherwise hard-coded in the source anyway.
Author: Steve Langasek <vorlon@debian.org>
Bug-Debian: http://bugs.debian.org/639300
Bug-Ubuntu: https://bugs.launchpad.net/bugs/901638
Index: soprano-2.7.5+dfsg.1/cmake/modules/FindIODBC.cmake
===================================================================
--- soprano-2.7.5+dfsg.1.orig/cmake/modules/FindIODBC.cmake
+++ soprano-2.7.5+dfsg.1/cmake/modules/FindIODBC.cmake
@@ -57,10 +57,11 @@
${iodbc_INCLUDE_DIRS}
)
-find_library(IODBC_LIBRARIES NAMES iodbc
- HINTS
- ${iodbc_LIBRARY_DIRS}
- )
+#find_library(IODBC_LIBRARIES NAMES iodbc
+# HINTS
+# ${iodbc_LIBRARY_DIRS}
+# )
+set(IODBC_LIBRARIES "/usr/lib/odbc/virtodbc_r.so")
if (IODBC_LIBRARIES AND IODBC_INCLUDE_DIR)
# set(IODBC_INCLUDE_DIR "${IODBC_INCLUDE_DIR}/iodbc")
Index: soprano-2.7.5+dfsg.1/backends/virtuoso/CMakeLists.txt
===================================================================
--- soprano-2.7.5+dfsg.1.orig/backends/virtuoso/CMakeLists.txt
+++ soprano-2.7.5+dfsg.1/backends/virtuoso/CMakeLists.txt
@@ -37,6 +37,7 @@
target_link_libraries(soprano_virtuosobackend odbc32)
else(WIN32)
target_link_libraries(soprano_virtuosobackend ${IODBC_LIBRARIES})
+SET_TARGET_PROPERTIES(soprano_virtuosobackend PROPERTIES INSTALL_RPATH "/usr/lib/odbc")
endif(WIN32)
if(WIN32)
|