[clblas] 06/08: add multi-arch support

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit fe48a9273463247ba9b22a339c7a35a0b96a715c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri May 29 15:09:30 2015 +0100

    add multi-arch support
---
 debian/libclblas-dev.install               |  4 ++--
 debian/libclblas2.install                  |  2 +-
 debian/patches/0001-enable-multiarch.patch | 20 ++++++++++++++++++++
 debian/patches/series                      |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/libclblas-dev.install b/debian/libclblas-dev.install
index 1a4ffe6..ee51a12 100644
--- a/debian/libclblas-dev.install
+++ b/debian/libclblas-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib*/*.so usr/lib
-usr/share/clBLAS/*.cmake usr/lib/cmake/clBLAS
+usr/lib/*/*.so
+usr/lib/*/cmake/clBLAS/*.cmake
diff --git a/debian/libclblas2.install b/debian/libclblas2.install
index 03a43ba..3de3b10 100644
--- a/debian/libclblas2.install
+++ b/debian/libclblas2.install
@@ -1 +1 @@
-usr/lib*/*.so.* usr/lib
+usr/lib/*/*.so.*
diff --git a/debian/patches/0001-enable-multiarch.patch b/debian/patches/0001-enable-multiarch.patch
new file mode 100644
index 0000000..2b21e01
--- /dev/null
+++ b/debian/patches/0001-enable-multiarch.patch
@@ -0,0 +1,20 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -105,7 +105,7 @@
+     endif( )
+ endif()
+ 
+-set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
++set( SUFFIX_LIB "/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "String to append to 'lib' install path" )
+ set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
+ 
+ if( MSVC_IDE )
+@@ -297,7 +297,7 @@
+ if(WIN32)
+   set(destdir CMake)
+ else()
+-  set(destdir share/clBLAS)
++  set(destdir lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/clBLAS)
+ endif()
+ string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
+ configure_file(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4d1722
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-enable-multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git