[open-coarrays] 41/80: Enable multi-arch install

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit 732cc4a56c2510ac2fd37bcdeff532982d7ad66b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 4 02:18:36 2016 +0000

    Enable multi-arch install
---
 debian/changelog               |  3 ++-
 debian/control                 |  2 ++
 debian/libcoarrays-dev.install |  7 +++----
 debian/libcoarrays0d.install   |  2 +-
 debian/rules                   | 13 ++++++++++++-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c2625d..1cedbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 open-coarrays (1.7.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
-  * Mark open-coarrays-bin as M-A: same
+  * Re-enable tests for alpha, powerpc
+  * Multi-Arch enable
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 04 Nov 2016 01:39:33 +0000
 
diff --git a/debian/control b/debian/control
index 4aa876a..4352ffe 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Homepage: https://www.opencoarrays.org/
 Package: libcoarrays-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}, gfortran (>= 6.1-1), mpi-default-bin,
  libcoarrays0d (= ${binary:Version})
 Description: Co-Array Fortran libraries for gfortran - development files
@@ -26,6 +27,7 @@ Description: Co-Array Fortran libraries for gfortran - development files
 Package: libcoarrays0d
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Co-Array Fortran libraries for gfortran
  OpenCoArrays is an open-source software project that supports the
diff --git a/debian/libcoarrays-dev.install b/debian/libcoarrays-dev.install
index 11e9cff..29ff251 100644
--- a/debian/libcoarrays-dev.install
+++ b/debian/libcoarrays-dev.install
@@ -1,5 +1,4 @@
-/usr/lib/cmake/*
-/usr/lib/libcaf_single_static.a	/usr/lib/libcaf_single.a
-/usr/lib/libcaf_mpi_static.a	/usr/lib/libcaf_mpi.a
-/usr/lib/libcaf_*.so
+/usr/lib/*/cmake/*
+/usr/lib/*/libcaf_single_static.a	
+/usr/lib/*/libcaf_mpi_static.a
 /usr/mod/*	/usr/include
diff --git a/debian/libcoarrays0d.install b/debian/libcoarrays0d.install
index baa8f48..62d4766 100644
--- a/debian/libcoarrays0d.install
+++ b/debian/libcoarrays0d.install
@@ -1 +1 @@
-/usr/lib/libcaf*0d
+/usr/lib/*/libcaf*0d
diff --git a/debian/rules b/debian/rules
index 654d333..e1e1306 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,27 @@
 
 export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+
 # The magic debhelper  rule
 %:
 	dh $@ --buildsystem=cmake
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DISABLED_TESTS:= "powerpc alpha"
+# DISABLED_TESTS:= "powerpc alpha"
 
 override_dh_auto_configure:
 	        CC=mpicc FC=mpifort dh_auto_configure
 
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p debian/tmp/$(LIBDIR)
+	cp debian/tmp/usr/lib/libcaf* debian/tmp/$(LIBDIR)
+	cp -a debian/tmp/usr/lib/cmake debian/tmp/$(LIBDIR)/cmake
+	dh_link -p libcoarrays-dev $(LIBDIR)/libcaf_single.so.0d $(LIBDIR)/libcaf_single.so
+	dh_link -p libcoarrays-dev $(LIBDIR)/libcaf_mpi.so.0d $(LIBDIR)/libcaf_mpi.so
+
 override_dh_auto_test:
 ifeq (,$(findstring  "$(DEB_HOST_ARCH)",$(DISABLED_TESTS)))
 	@echo "Tests disabled on this arch: known failures being investigated"

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