Source: scalapack Severity: important Tags: patch Attached is a patch for scalapack to build against openmpi1.10. Note that this really also requires: (1) depend on pkg-config (2) build-depend on mpi-default-dev/openmpi >= 1.10.2 (See #813494)
-- System Information: Debian Release: 8.2 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 3.16.0-4-686-pae (SMP w/1 CPU core) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_IE.UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -urN scalapack-1.8.0/debian/changelog scalapack-1.8.0.new/debian/changelog --- scalapack-1.8.0/debian/changelog 2015-03-10 09:10:28.000000000 +0000 +++ scalapack-1.8.0.new/debian/changelog 2016-02-01 19:50:02.115258698 +0000 @@ -1,3 +1,10 @@ +scalapack (1.8.0-12.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix for openmpi1.10 transition: Use pkg-config mpi-fort --libs + + -- Alastair McKinstry <[email protected]> Mon, 01 Feb 2016 19:49:43 +0000 + scalapack (1.8.0-12.1) unstable; urgency=medium * Non-maintainer upload. diff -urN scalapack-1.8.0/debian/patches/01_SLmake.inc.patch scalapack-1.8.0.new/debian/patches/01_SLmake.inc.patch --- scalapack-1.8.0/debian/patches/01_SLmake.inc.patch 2011-12-25 18:56:52.000000000 +0000 +++ scalapack-1.8.0.new/debian/patches/01_SLmake.inc.patch 2016-02-01 19:28:21.720189006 +0000 @@ -9,12 +9,12 @@ +ifeq ($(MPI),openmpi) +USEMPI = -DUsingMpiBlacs +ifeq ($(BUILD),static) -+SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77 ++SMPLIB = $$(pkg-config mpi-fort --libs) +BLACSFINIT = /usr/lib/libblacsF77init-openmpi.a +BLACSCINIT = /usr/lib/libblacsCinit-openmpi.a +BLACSLIB = /usr/lib/libblacs-openmpi.a +else -+SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77 ++SMPLIB = $$(pkg-config mpi-fort --libs) +BLACSFINIT = -lblacsF77init-openmpi +BLACSCINIT = -lblacsCinit-openmpi +BLACSLIB = -lblacs-openmpi diff -urN scalapack-1.8.0/debian/rules scalapack-1.8.0.new/debian/rules --- scalapack-1.8.0/debian/rules 2015-03-10 09:08:06.000000000 +0000 +++ scalapack-1.8.0.new/debian/rules 2016-02-01 19:20:30.194770251 +0000 @@ -49,7 +49,7 @@ ar x ../$${i}_openmpi.a ;\ cd .. ;\ gcc -shared -Wl,-soname=lib$$i-openmpi.so.$(version_major) -o \ - lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-openmpi -lblacs-openmpi -L/usr/lib/openmpi/lib -lmpi -lmpi_f77 -lgfortran;\ + lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-openmpi -lblacs-openmpi $$(pkg-config mpi-fort --libs) -lgfortran;\ ln -snf lib$$i-openmpi.so.$(version) lib$$i-openmpi.so.$(version_major) ;\ ln -snf lib$$i-openmpi.so.$(version_major) lib$$i-openmpi.so ;\ rm tmp/* ;\
