linking against libmpichfort was still missing, and dropped the lam patch, not
tested.
* Link the mpich based library against the libmpich and libmpichfort.
* Remove ppc64 from the mpich architectures.
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
@@ -36,7 +36,7 @@
Package: libblacs-mpich1
Section: libs
-Architecture: hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: hppa m68k powerpcspe s390x sparc64
Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
Breaks: libblacs-mpi1 (<< 1.1-31.2)
Replaces: blacs1-mpich, blacs1gf-mpich, blacs1-lam, blacs1gf-lam,
@@ -59,9 +59,9 @@
Package: libblacs-mpi-dev
Section: libdevel
-Architecture: alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el hppa m68k powerpcspe s390x sparc64
Depends: libblacs-openmpi1 (= ${binary:Version}) [alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el],
- libblacs-mpich1 (= ${binary:Version}) [hppa m68k powerpcspe ppc64 s390x sparc64],
+ libblacs-mpich1 (= ${binary:Version}) [hppa m68k powerpcspe s390x sparc64],
mpi-default-dev, ${misc:Depends}
Replaces: blacs-mpi, blacs-mpich-dev, blacsgf-mpich-dev, blacs-lam-dev, blacsgf-lam-dev
Conflicts: blacs-mpi, blacs-mpich-dev, blacsgf-mpich-dev, blacs-lam-dev, blacsgf-lam-dev
@@ -82,7 +82,7 @@
Package: blacs-mpi-test
Section: math
-Architecture: alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el hppa m68k powerpcspe s390x sparc64
Depends: blacs-test-common, ${shlibs:Depends}, ${misc:Depends}
Replaces: blacs-mpich-test, blacsgf-mpich-test, blacs-lam-test, blacsgf-lam-test
Conflicts: blacs-mpich-test, blacsgf-mpich-test, blacs-lam-test, blacsgf-lam-test
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
@@ -12,7 +12,7 @@
# package. If there is a mismatch between the two, the package will FTBFS. This
# is on purpose, to avoid silent breakage. See #740620 for more details.
OPENMPI_ARCHS=alpha amd64 armel armhf arm64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el sparc mips64 mips64el
-MPICH_ARCHS=hppa m68k powerpcspe ppc64 s390x sparc64
+MPICH_ARCHS=hppa m68k powerpcspe s390x sparc64
build: build-$(ARCH_DEFAULT_MPI_IMPL)
@@ -139,7 +139,7 @@
done;\
cd .. ;\
gcc -shared -Wl,-soname=lib$$i-mpich.so.1 -o lib$$i-mpich.so.1.1 \
- $$(find tmp -name "*.o");\
+ $$(find tmp -name "*.o") -lmpich -lmpichfort;\
ln -fs lib$$i-mpich.so.1.1 lib$$i-mpich.so.1 ;\
ln -fs lib$$i-mpich.so.1 lib$$i-mpich.so ;\
rm -f tmp/tmp/* ; rmdir tmp/tmp ; rm tmp/* ;\
