Control: tags 813490 + pending

Dear maintainer,

I've prepared an NMU for blacs-mpi (versioned as 1.1-33.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

I used DELEYED/5 just because this bug is really recent, but since it's
now one blocker in a transition I already did it.
I'll be happy to reschedule the NMU as you see fit.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  http://mapreri.org                              : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for blacs-mpi_1.1-33.1 blacs-mpi_1.1-33.2

 blacs-mpi-implementations.patch |    2 +-
 changelog                       |    9 +++++++++
 control                         |    2 +-
 control.in                      |    2 +-
 rules                           |    2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff -u blacs-mpi-1.1/debian/blacs-mpi-implementations.patch blacs-mpi-1.1/debian/blacs-mpi-implementations.patch
--- blacs-mpi-1.1/debian/blacs-mpi-implementations.patch
+++ blacs-mpi-1.1/debian/blacs-mpi-implementations.patch
@@ -76,7 +76,7 @@
 +   MPIdir = /usr/lib/openmpi
 +   MPILIBdir = $(MPIdir)/lib
 +   MPIINCdir = $(MPIdir)/include
-+   MPILIB = -L/usr/lib/openmpi/lib -lmpi -lmpi_f77
++   MPILIB = $$(pkg-config mpi-fort --libs)
 +   CC = mpicc.openmpi
 +   F77 = mpif90.openmpi
 +   TRANSCOMM = -DUseMpi2
diff -u blacs-mpi-1.1/debian/changelog blacs-mpi-1.1/debian/changelog
--- blacs-mpi-1.1/debian/changelog
+++ blacs-mpi-1.1/debian/changelog
@@ -1,3 +1,12 @@
+blacs-mpi (1.1-33.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use `pkg-config mpi-fort --libs` rather than hard-coded libs for
+    openmpi.  Patch from Alastair McKinstry <mckins...@debian.org>.
+    Closes: #813490
+
+ -- Mattia Rizzolo <mat...@debian.org>  Wed, 03 Feb 2016 08:44:20 +0000
+
 blacs-mpi (1.1-33.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u blacs-mpi-1.1/debian/control blacs-mpi-1.1/debian/control
--- blacs-mpi-1.1/debian/control
+++ blacs-mpi-1.1/debian/control
@@ -8,7 +8,7 @@
 Priority: extra
 Maintainer: Muammar El Khatib <muam...@debian.org>
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7), mpi-default-dev (>= 1.0), gfortran
+Build-Depends: debhelper (>= 7), mpi-default-dev (>= 1.0), gfortran, pkg-config
 Homepage: http://www.netlib.org/blacs/
 
 Package: libblacs-openmpi1
diff -u blacs-mpi-1.1/debian/control.in blacs-mpi-1.1/debian/control.in
--- blacs-mpi-1.1/debian/control.in
+++ blacs-mpi-1.1/debian/control.in
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Muammar El Khatib <muam...@debian.org>
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7), mpi-default-dev (>= 1.0), gfortran
+Build-Depends: debhelper (>= 7), mpi-default-dev (>= 1.0), gfortran, pkg-config
 Homepage: http://www.netlib.org/blacs/
 
 Package: libblacs-openmpi1
diff -u blacs-mpi-1.1/debian/rules blacs-mpi-1.1/debian/rules
--- blacs-mpi-1.1/debian/rules
+++ blacs-mpi-1.1/debian/rules
@@ -57,7 +57,7 @@
 	  done;\
 	  cd .. ;\
 	  gcc -shared -Wl,-soname=lib$$i-openmpi.so.1 -o lib$$i-openmpi.so.1.1 \
-	    -L/usr/lib/openmpi/lib/ $$(find tmp -name "*.o") -lmpi -lmpi_f77; \
+	    $$(find tmp -name "*.o") $$(pkg-config mpi-fort --libs); \
 	  ln -fs lib$$i-openmpi.so.1.1 lib$$i-openmpi.so.1 ;\
 	  ln -fs lib$$i-openmpi.so.1 lib$$i-openmpi.so ;\
 	  rm -f tmp/tmp/* ; rmdir tmp/tmp ; rm tmp/* ;\

Attachment: signature.asc
Description: PGP signature

Reply via email to