[scalapack] 02/08: Place libraries in multiarch dir.
Drew Parsons
dparsons at moszumanska.debian.org
Sun Jun 11 19:49:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to tag debian/1.8.0-14
in repository scalapack.
commit 2f1499de6549a7ba79b0e756daf79036ef045ebf
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Jun 12 02:10:22 2017 +0800
Place libraries in multiarch dir.
Leave test executables in /usr/lib/scalapack so as not to increase
package complexity.
---
debian/changelog | 1 +
debian/control.in | 2 +-
debian/libscalapack-mpi-dev.dirs | 3 ++-
debian/libscalapack-mpich1.install | 3 ++-
debian/libscalapack-openmpi1.install | 3 ++-
debian/libscalapack-pvm-dev.dirs | 4 +++-
debian/libscalapack-pvm1.dirs | 3 ++-
debian/rules | 28 +++++++++++++++-------------
8 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9515eda..789f948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ scalapack (1.8.0-14) UNRELEASED; urgency=medium
* Team upload.
* Update list of openmpi archs: add powerpcspe, remove mips64, sparc.
+ * Place libraries in multiarch dir.
-- Drew Parsons <dparsons at debian.org> Mon, 12 Jun 2017 01:45:40 +0800
diff --git a/debian/control.in b/debian/control.in
index 3273848..b0e41c7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Muammar El Khatib <muammar at debian.org>
Standards-Version: 3.8.4
-Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), libblacs-mpi-dev, pkg-config
+Build-Depends: mpi-default-dev, pvm-dev, blacs-pvm-dev, gfortran, liblapack-dev, libblas-dev, debhelper (>= 6), dh-exec, libblacs-mpi-dev, pkg-config
Homepage: http://www.netlib.org/scalapack/
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/scalapack.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/scalapack.git/
diff --git a/debian/libscalapack-mpi-dev.dirs b/debian/libscalapack-mpi-dev.dirs
index 6845771..6a7b605 100644
--- a/debian/libscalapack-mpi-dev.dirs
+++ b/debian/libscalapack-mpi-dev.dirs
@@ -1 +1,2 @@
-usr/lib
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libscalapack-mpich1.install b/debian/libscalapack-mpich1.install
old mode 100644
new mode 100755
index 4b6b9e0..17778b7
--- a/debian/libscalapack-mpich1.install
+++ b/debian/libscalapack-mpich1.install
@@ -1 +1,2 @@
-libscalapack-mpich.so.* usr/lib
+#! /usr/bin/dh-exec
+libscalapack-mpich.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libscalapack-openmpi1.install b/debian/libscalapack-openmpi1.install
old mode 100644
new mode 100755
index 5842364..defa41c
--- a/debian/libscalapack-openmpi1.install
+++ b/debian/libscalapack-openmpi1.install
@@ -1 +1,2 @@
-libscalapack-openmpi.so.* usr/lib
+#! /usr/bin/dh-exec
+libscalapack-openmpi.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libscalapack-pvm-dev.dirs b/debian/libscalapack-pvm-dev.dirs
old mode 100644
new mode 100755
index 6845771..8657abf
--- a/debian/libscalapack-pvm-dev.dirs
+++ b/debian/libscalapack-pvm-dev.dirs
@@ -1 +1,3 @@
-usr/lib
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}
+
diff --git a/debian/libscalapack-pvm1.dirs b/debian/libscalapack-pvm1.dirs
old mode 100644
new mode 100755
index 6845771..6a7b605
--- a/debian/libscalapack-pvm1.dirs
+++ b/debian/libscalapack-pvm1.dirs
@@ -1 +1,2 @@
-usr/lib
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index f3dbb53..02a73f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ version_major:=$(shell echo $(version) | cut -d '.' -f 1)
topdir=$(shell pwd)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
include /usr/share/mpi-default-dev/debian_defaults
SCALAPACK_MPI=$(ARCH_DEFAULT_MPI_IMPL)
@@ -330,7 +332,7 @@ install-stamp-openmpi: build-stamp-openmpi
set -e ;\
for i in scalapack ; do \
cp -a lib$$i-openmpi.so \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
done
install TESTING/x*-openmpi \
@@ -339,7 +341,7 @@ install-stamp-openmpi: build-stamp-openmpi
set -e ;\
for i in scalapack ; do \
install $${i}_openmpi.a \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-openmpi.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$i-openmpi.a ;\
done
touch install-stamp-openmpi
@@ -351,9 +353,9 @@ install-stamp-lam: build-stamp-lam
set -e ;\
for i in scalapack ; do \
cp -a lib$$i-lam.so.* \
- `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi1/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
cp -a lib$$i-lam.so \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
done
install TESTING/x*-lam \
@@ -362,7 +364,7 @@ install-stamp-lam: build-stamp-lam
set -e ;\
for i in scalapack ; do \
install $${i}_lam.a \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-lam.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$i-lam.a ;\
done
touch install-stamp-lam
@@ -379,7 +381,7 @@ install-stamp-mpich: build-stamp-mpich
set -e ;\
for i in scalapack ; do \
cp -a lib$$i-mpich.so \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
done
install TESTING/x*-mpich \
@@ -388,7 +390,7 @@ install-stamp-mpich: build-stamp-mpich
set -e ;\
for i in scalapack ; do \
install $${i}_mpich.a \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-mpich.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$i-mpich.a ;\
done
touch install-stamp-mpich
@@ -400,9 +402,9 @@ install-stamp-mpich2: build-stamp-mpich2
set -e ;\
for i in scalapack ; do \
cp -a lib$$i-mpich2.so.* \
- `pwd`/debian/libscalapack-mpi1/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi1/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
cp -a lib$$i-mpich2.so \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/ ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
done
install TESTING/x*-mpich2 \
@@ -411,7 +413,7 @@ install-stamp-mpich2: build-stamp-mpich2
set -e ;\
for i in scalapack ; do \
install $${i}_mpich2.a \
- `pwd`/debian/libscalapack-mpi-dev/usr/lib/lib$$i-mpich2.a ;\
+ `pwd`/debian/libscalapack-mpi-dev/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$i-mpich2.a ;\
done
touch install-stamp-mpich2
@@ -423,9 +425,9 @@ install-stamp-pvm: build-stamp-pvm
set -e ;\
for i in scalapack ; do \
cp -a lib$$i-pvm.so.* \
- `pwd`/debian/libscalapack-pvm1/usr/lib/ ;\
+ `pwd`/debian/libscalapack-pvm1/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
cp -a lib$$i-pvm.so \
- `pwd`/debian/libscalapack-pvm-dev/usr/lib/ ;\
+ `pwd`/debian/libscalapack-pvm-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ ;\
done
install TESTING/x*-pvm \
@@ -434,7 +436,7 @@ install-stamp-pvm: build-stamp-pvm
set -e ;\
for i in scalapack ; do \
install $${i}_pvm.a \
- `pwd`/debian/libscalapack-pvm-dev/usr/lib/lib$$i-pvm.a ;\
+ `pwd`/debian/libscalapack-pvm-dev/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$i-pvm.a ;\
done
touch install-stamp-pvm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git
More information about the debian-science-commits
mailing list