[scalapack] 03/05: libscalapack-{openmpi, mpich}-dev provides scalapack pkgconfig files

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository scalapack.

commit 1b09b19102d185208eac575e71096a45a6c951ab
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Aug 5 22:05:25 2017 +0800

    libscalapack-{openmpi,mpich}-dev provides scalapack pkgconfig files
    
    specific for each mpi
    
    could set libdir using cmake/make (see scalapack.pc.in), but since we
    need to change the contents anyone to switch -lscalapack for
    -lscalapack-$mpi, it's simple enough to fix the libdir at the same time.
---
 debian/changelog                        | 3 ++-
 debian/libscalapack-mpich-dev.dirs      | 1 +
 debian/libscalapack-mpich-dev.install   | 4 ++--
 debian/libscalapack-openmpi-dev.dirs    | 1 +
 debian/libscalapack-openmpi-dev.install | 4 ++--
 debian/rules                            | 1 +
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d19e2f..59c954c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ scalapack (2.0.2-1exp4) UNRELEASED; urgency=medium
   * Both libscalapack-openmpi-dev and libscalapack-openmpi-dev 
     Breaks: libscalapack-mpi-dev (<< 2.0.2-1), since they now handle
     /usr/lib/<arch>/libscalapack-{openmpi,mpich}.so. Closes: #870582.
-  * libscalapack-{openmpi,mpich}-dev provides scalapack cmake files
+  * libscalapack-{openmpi,mpich}-dev provides scalapack cmake and
+    pkgconfig files
 
  -- Drew Parsons <dparsons at debian.org>  Wed, 19 Jul 2017 18:56:59 +0800
 
diff --git a/debian/libscalapack-mpich-dev.dirs b/debian/libscalapack-mpich-dev.dirs
index df4811e..1a3e372 100755
--- a/debian/libscalapack-mpich-dev.dirs
+++ b/debian/libscalapack-mpich-dev.dirs
@@ -1,3 +1,4 @@
 #! /bin/sh
 echo usr/lib/${DEB_HOST_MULTIARCH}
+echo usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 echo usr/lib/cmake/scalapack-2.0.2.mpich
\ No newline at end of file
diff --git a/debian/libscalapack-mpich-dev.install b/debian/libscalapack-mpich-dev.install
index 92d26ef..649ee1e 100755
--- a/debian/libscalapack-mpich-dev.install
+++ b/debian/libscalapack-mpich-dev.install
@@ -1,8 +1,8 @@
 #! /bin/sh
 flavour=mpich
 echo usr/lib/libscalapack-${flavour}.so usr/lib/${DEB_HOST_MULTIARCH}
-# usr/lib/pkgconfig/scalapack.pc
-for c in config config-version scalapack-targets; do
+echo build-${flavour}/scalapack-${flavour}.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+for c in config config-version targets; do
   echo usr/lib/cmake/scalapack-2.0.2/scalapack-${c}.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}
 done
 # scalapack-targets-none.cmake is specific to the mpi flavour, so grab from the mpi build dir
diff --git a/debian/libscalapack-openmpi-dev.dirs b/debian/libscalapack-openmpi-dev.dirs
index 1fe743e..b4341a5 100755
--- a/debian/libscalapack-openmpi-dev.dirs
+++ b/debian/libscalapack-openmpi-dev.dirs
@@ -1,3 +1,4 @@
 #! /bin/sh
 echo usr/lib/${DEB_HOST_MULTIARCH}
+echo usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 echo usr/lib/cmake/scalapack-2.0.2.openmpi
diff --git a/debian/libscalapack-openmpi-dev.install b/debian/libscalapack-openmpi-dev.install
index 93d6acd..4fe167d 100755
--- a/debian/libscalapack-openmpi-dev.install
+++ b/debian/libscalapack-openmpi-dev.install
@@ -1,8 +1,8 @@
 #! /bin/sh
 flavour=openmpi
 echo usr/lib/libscalapack-${flavour}.so usr/lib/${DEB_HOST_MULTIARCH}
-# usr/lib/pkgconfig/scalapack.pc
-for c in config config-version scalapack-targets; do
+echo build-${flavour}/scalapack-${flavour}.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+for c in config config-version targets; do
   echo usr/lib/cmake/scalapack-2.0.2/scalapack-${c}.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}
 done
 # scalapack-targets-none.cmake is specific to the mpi flavour, so grab from the mpi build dir
diff --git a/debian/rules b/debian/rules
index 82a7b10..11bfb02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,7 @@ override_dh_auto_install:
 	for flavor in openmpi mpich; do \
 	  echo "Installing scalapack-$$flavor" ; \
 	  dh_auto_install -O--parallel --builddirectory=build-$$flavor ; \
+	  sed "s/-lscalapack/-lscalapack-$$flavour/; s|/usr/lib|/usr/lib/$(DEB_HOST_MULTIARCH)|" build-$$flavor/scalapack.pc > build-$$flavor/scalapack-$$flavor.pc ; \
 	done
 
 override_dh_install:

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