[clfft] 03/12: Use SUFFIX_LIB cmake option to enable multiarch

[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 clfft.

commit 6edd02e72242cfa2ca63c4492d981b269ee5f677
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 27 12:19:40 2015 +0000

    Use SUFFIX_LIB cmake option to enable multiarch
---
 debian/patches/debian-enable-multiarch.patch | 16 ----------------
 debian/patches/series                        |  1 -
 debian/rules                                 |  6 +++++-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/patches/debian-enable-multiarch.patch b/debian/patches/debian-enable-multiarch.patch
deleted file mode 100644
index 0655df8..0000000
--- a/debian/patches/debian-enable-multiarch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: enable multiarch installation paths 
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -125,7 +125,7 @@
- 	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
- 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" )
- 
- # Useful variables to configure FindBoost.cake
diff --git a/debian/patches/series b/debian/patches/series
index eb7c8e8..00f4375 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-debian-enable-multiarch.patch
 disable-multilib-cflags.patch
 fix-client-no-symlink.patch
 fix-docs-output.patch
diff --git a/debian/rules b/debian/rules
index a274976..1ccdaba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+# Environment information.
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --sourcedirectory=src \
 		--buildsystem=cmake \
@@ -22,7 +25,8 @@ override_dh_auto_configure:
 		-DBUILD_TEST=OFF \
 		-DBUILD_LOADLIBRARIES=OFF \
 		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_EXAMPLES=OFF
+		-DBUILD_EXAMPLES=OFF \
+		-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build:
 	dh_auto_build

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