Package: soprano / 2.9.4+dfsg-5

add_library_architecture_to_libDirs.patch Patch series | download
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
Description: Add multi-arch paths to virtuoso's plugins search path.
 This patch adds multi arch paths to the list of possible paths in where
 virtuoso plugins can be found.
 It does not adds this path if the build happens on a non-m-a aware
 environment.
Author: Maximiliano Curia <maxy@debian.org>
Bug: https://sourceforge.net/p/soprano/bugs/32
Last-Update: 2013-11-04

Index: soprano/CMakeLists.txt
===================================================================
--- soprano.orig/CMakeLists.txt	2013-11-04 13:08:44.205290167 +0100
+++ soprano/CMakeLists.txt	2013-11-04 13:08:44.201290328 +0100
@@ -138,6 +138,10 @@
 endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 set(HAVE_DBUS BUILD_DBUS_SUPPORT)
 
+if(CMAKE_LIBRARY_ARCHITECTURE)
+    add_definitions(-DLIBRARY_ARCHITECTURE="${CMAKE_LIBRARY_ARCHITECTURE}")
+endif(CMAKE_LIBRARY_ARCHITECTURE)
+
 ##################  setup install directories  ################################
 set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
Index: soprano/soprano/sopranodirs.cpp
===================================================================
--- soprano.orig/soprano/sopranodirs.cpp	2013-11-04 13:08:44.205290167 +0100
+++ soprano/soprano/sopranodirs.cpp	2013-11-04 13:08:44.201290328 +0100
@@ -132,6 +132,10 @@
 #else
     paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
     paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
+#ifdef LIBRARY_ARCHITECTURE
+    paths << QLatin1String( "/usr/lib/"LIBRARY_ARCHITECTURE );
+    paths << QLatin1String( "/usr/local/lib/"LIBRARY_ARCHITECTURE );
+#endif
     paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
 #endif
     return paths;