- added lib patch (lib64 support) auto/th/flann-1.8.3-1
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 28 Dec 2012 17:58:37 +0000 (18:58 +0100)
committerJakub Bogusz <qboosh@pld-linux.org>
Fri, 28 Dec 2012 17:58:37 +0000 (18:58 +0100)
flann-lib.patch [new file with mode: 0644]
flann.spec

diff --git a/flann-lib.patch b/flann-lib.patch
new file mode 100644 (file)
index 0000000..16e6f84
--- /dev/null
@@ -0,0 +1,10 @@
+--- flann-1.8.3-src/cmake/flann_utils.cmake.orig       2012-12-23 12:52:22.000000000 +0100
++++ flann-1.8.3-src/cmake/flann_utils.cmake    2012-12-28 18:50:08.599502844 +0100
+@@ -1,6 +1,6 @@
+ macro(GET_OS_INFO)
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+-    set(FLANN_LIB_INSTALL_DIR "lib")
++    set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+     set(FLANN_INCLUDE_INSTALL_DIR
+         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
+ endmacro(GET_OS_INFO)
index 893b191..0e9b315 100644 (file)
@@ -14,6 +14,7 @@ Group:                Libraries
 Source0:       http://people.cs.ubc.ca/~mariusm/uploads/FLANN/%{name}-%{version}-src.zip
 # Source0-md5: a5676ca98f860a5b43d0d3a7d8a62903
 Patch0:                %{name}-python.patch
+Patch1:                %{name}-lib.patch
 URL:           http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
 BuildRequires: cmake >= 2.6
 %{?with_gomp:BuildRequires:    gcc-c++ >= 6:4.2}
@@ -106,6 +107,7 @@ DowiÄ…zania Pythona do biblioteki FLANN.
 %prep
 %setup -q -n flann-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
This page took 0.077036 seconds and 4 git commands to generate.