[flann/el5: 9/12] - further updates for 64-bit systems (s390x, sparc64)
rmattes
rmattes at fedoraproject.org
Tue Dec 20 01:09:22 UTC 2011
commit 0e9e624f034d6feefae09407fbf9e73304ae2bb3
Author: Dan HorĂ¡k <dan at danny.cz>
Date: Sat Feb 5 15:20:00 2011 +0100
- further updates for 64-bit systems (s390x, sparc64)
Conflicts:
flann.spec
flann-1.6.7.64bit.patch | 16 ++++++++++++++++
flann-1.6.7.ppc64.patch | 12 ------------
2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/flann-1.6.7.64bit.patch b/flann-1.6.7.64bit.patch
new file mode 100644
index 0000000..e29ca58
--- /dev/null
+++ b/flann-1.6.7.64bit.patch
@@ -0,0 +1,16 @@
+diff -up flann-1.6.7-src/cmake/flann_utils.cmake.64bit flann-1.6.7-src/cmake/flann_utils.cmake
+--- flann-1.6.7-src/cmake/flann_utils.cmake.64bit 2011-01-18 23:34:57.000000000 +0100
++++ flann-1.6.7-src/cmake/flann_utils.cmake 2011-02-05 14:47:28.000000000 +0100
+@@ -3,6 +3,12 @@ macro(GET_OS_INFO)
+ if(OS_IS_LINUX)
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ set(FLANN_LIB_INSTALL_DIR "lib64")
++ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
++ set(FLANN_LIB_INSTALL_DIR "lib64")
++ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
++ set(FLANN_LIB_INSTALL_DIR "lib64")
++ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sparc64")
++ set(FLANN_LIB_INSTALL_DIR "lib64")
+ else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ set(FLANN_LIB_INSTALL_DIR "lib")
+ endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
More information about the scm-commits
mailing list