r45495 - in /packages/flann/trunk/debian: changelog patches/fixmultiarchlibinstall.patch patches/series rules

[malat at users.alioth.debian.org]

Author: malat
Date: Thu Jan  3 12:52:46 2013
New Revision: 45495

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45495
Log:
Make lib multiarch

Added:
    packages/flann/trunk/debian/patches/fixmultiarchlibinstall.patch
Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/patches/series
    packages/flann/trunk/debian/rules

Modified: packages/flann/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/changelog?rev=45495&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Thu Jan  3 12:52:46 2013
@@ -8,8 +8,9 @@
   * remove patch not needed anymore:
     - debian/patches/remove_lib64.patch
   * Remove obsolete DMUA flag
+  * Use multiarch lib path
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 03 Jan 2013 13:11:26 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 03 Jan 2013 13:51:42 +0100
 
 flann (1.7.1-4) unstable; urgency=low
 

Added: packages/flann/trunk/debian/patches/fixmultiarchlibinstall.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/fixmultiarchlibinstall.patch?rev=45495&op=file
==============================================================================
--- packages/flann/trunk/debian/patches/fixmultiarchlibinstall.patch (added)
+++ packages/flann/trunk/debian/patches/fixmultiarchlibinstall.patch Thu Jan  3 12:52:46 2013
@@ -1,0 +1,16 @@
+Description: Allow multi-arch lib installation
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- flann-1.8.3.orig/cmake/flann_utils.cmake
++++ flann-1.8.3/cmake/flann_utils.cmake
+@@ -1,6 +1,8 @@
+ macro(GET_OS_INFO)
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+-    set(FLANN_LIB_INSTALL_DIR "lib")
++    if(NOT DEFINED FLANN_LIB_INSTALL_DIR)
++      set(FLANN_LIB_INSTALL_DIR "lib")
++    endif()
+     set(FLANN_INCLUDE_INSTALL_DIR
+         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
+ endmacro(GET_OS_INFO)

Modified: packages/flann/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/series?rev=45495&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/series (original)
+++ packages/flann/trunk/debian/patches/series Thu Jan  3 12:52:46 2013
@@ -1,1 +1,2 @@
 remove_tests.patch
+fixmultiarchlibinstall.patch

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=45495&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Thu Jan  3 12:52:46 2013
@@ -2,6 +2,8 @@
 #export DH_VERBOSE=1
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CMAKE_FLAGS = \
 	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -9,6 +11,7 @@
 	-DBUILD_PYTHON_BINDINGS:BOOL=OFF \
 	-DUSE_MPI:BOOL=ON \
 	-DUSE_OPENMP:BOOL=ON \
+	-DFLANN_LIB_INSTALL_DIR:STRING="lib/$(DEB_HOST_MULTIARCH)" \
 	-DBUILD_CUDA_LIB:BOOL=OFF
 
 %: