Control: tags -1 + patch pending Dear Maintainer,
Le mardi 03 décembre 2013 à 11:52 +0100, Michael Banck a écrit : > Package: blacs-mpi > Version: 1.1-31 > Severity: serious > if I try to rebuild the current unstable blacs-mpi version in sid chroot > on s390x (zelenka.debian.org), I get the following failure: I uploaded to DELAYED/2 a NMU of blacs-mpi versioned 1.1-31.1 and fixing that issue. The debdiff is attached. Don't hesitate to tell me if I should delay the upload longer. Cheers, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
diff -Nru 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 2013-12-22 13:27:56.000000000 +0000
+++ blacs-mpi-1.1/debian/blacs-mpi-implementations.patch 2013-12-22 13:27:57.000000000 +0000
@@ -40,7 +40,7 @@
#====================== SECTION 1: PATHS AND LIBRARIES =======================
#=============================================================================
# The following macros specify the name and location of libraries required by
-@@ -44,6 +78,9 @@
+@@ -44,24 +78,38 @@
BLACSCINIT = $(BLACSdir)/blacsCinit_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL).a
BLACSLIB = $(BLACSdir)/blacs_$(COMMLIB)-$(PLAT)-$(BLACSDBGLVL).a
@@ -50,11 +50,16 @@
# -------------------------------------
# Name and location of the MPI library.
# -------------------------------------
-@@ -55,13 +92,35 @@
+ ifeq ($(MPI),mpich)
+ # for compilation with mpich:
+ MPIdir = /usr/lib/mpich
+- MPIdev = ch_p4
+- MPIplat = LINUX
MPILIBdir = $(MPIdir)/lib
MPIINCdir = $(MPIdir)/include
- MPILIB = $(MPILIBdir)/shared/libmpich.so $(MPILIBdir)/shared/libpmpich.so $(MPILIBdir)/libmpich.a
+- MPILIB = $(MPILIBdir)/shared/libmpich.so $(MPILIBdir)/shared/libpmpich.so $(MPILIBdir)/libmpich.a
-else
++ MPILIB = -lmpich
+ CC = mpicc.mpich
+ F77 = mpif90.mpich
+endif
@@ -74,31 +79,25 @@
+ MPILIB = -L/usr/lib/openmpi/lib -lmpi -lmpi_f77
+ CC = mpicc.openmpi
+ F77 = mpif90.openmpi
-+endif
-+ifeq ($(MPI),mpich2)
-+# for compilation with mpich2:
-+ MPIdir = /usr/lib/mpich2
-+ MPILIBdir = $(MPIdir)/lib
-+ MPIINCdir = $(MPIdir)/include
-+ MPILIB = -L/usr/lib/mpich2/lib -lmpich
-+ CC = mpicc.mpich2
-+ F77 = mpif90.mpich2
endif
-
# -------------------------------------
# All libraries required by the tester.
-@@ -155,6 +214,9 @@
- ifeq ($(MPI),mpich)
- TRANSCOMM = -DUseMpich
- endif
-+ifeq ($(MPI),mpich2)
-+ TRANSCOMM = -DUseMpich
-+endif
+@@ -98,11 +146,7 @@
+ # The directory to find the required communication library include files,
+ # if they are required by your system.
+ # -----------------------------------------------------------------------
+-ifeq ($(MPI),mpich)
+- SYSINC = -I$(MPIINCdir) -I$(MPIdir)/build/$(MPIplat)/$(MPIdev)/include
+-else
+- SYSINC = -I$(MPIINCdir)
+-endif
++SYSINC = -I$(MPIINCdir)
- # If you know that your MPI uses the same handles for fortran and C
- # communicators, you can replace the empty macro definition below with
-@@ -208,33 +270,3 @@
+ # ---------------------------------------------------------------------------
+ # The Fortran 77 to C interface to be used. If you are unsure of the correct
+@@ -208,33 +252,3 @@
#=============================== End SECTION 2 ===============================
#=============================================================================
diff -Nru blacs-mpi-1.1/debian/changelog blacs-mpi-1.1/debian/changelog
--- blacs-mpi-1.1/debian/changelog 2013-12-22 13:27:56.000000000 +0000
+++ blacs-mpi-1.1/debian/changelog 2013-12-22 13:27:57.000000000 +0000
@@ -1,3 +1,10 @@
+blacs-mpi (1.1-31.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Support MPICH3 which is now simply called MPICH. (Closes: #731225)
+
+ -- Sébastien Villemot <sebast...@debian.org> Sun, 22 Dec 2013 13:25:27 +0000
+
blacs-mpi (1.1-31) unstable; urgency=low
* Rebuilding with mpi-default-dev >=1.0 (Closes: #652312)
signature.asc
Description: This is a digitally signed message part
