[scalapack] 27/29: Import Debian changes 1.8.0-12.3
Muammar El Khatib
muammar at moszumanska.debian.org
Sun Jun 11 16:16:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
muammar pushed a commit to branch master
in repository scalapack.
commit 1084108c35ee3afde292e15942c064747a66a5b1
Author: Mattia Rizzolo <mattia at debian.org>
Date: Wed Feb 10 14:02:59 2016 +0000
Import Debian changes 1.8.0-12.3
scalapack (1.8.0-12.3) unstable; urgency=medium
* Non-maintainer upload.
* Update the list of MPI architectures.
+ switch s390x from mpich to OpenMPI.
+ switch sparc64 from mpich to OpenMPI.
+ switch ppc64 from mpich to OpenMPI.
+ add x32 to OpenMPI.
+ add sh4 to mpich.
+ drop powerpcspe.
+ Closes: #814334
* Fix FTBFS when using -Wl,--as-needed by adding -lm to the linker flags.
---
debian/changelog | 15 +++++++++++++++
debian/control | 12 ++++++------
debian/rules | 14 +++++++-------
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5020e6a..ef58307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+scalapack (1.8.0-12.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update the list of MPI architectures.
+ + switch s390x from mpich to OpenMPI.
+ + switch sparc64 from mpich to OpenMPI.
+ + switch ppc64 from mpich to OpenMPI.
+ + add x32 to OpenMPI.
+ + add sh4 to mpich.
+ + drop powerpcspe.
+ + Closes: #814334
+ * Fix FTBFS when using -Wl,--as-needed by adding -lm to the linker flags.
+
+ -- Mattia Rizzolo <mattia at debian.org> Wed, 10 Feb 2016 14:02:59 +0000
+
scalapack (1.8.0-12.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 8775304..2633f3d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Homepage: http://www.netlib.org/scalapack/
Package: libscalapack-openmpi1
Section: libs
-Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64el sparc
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64
Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack1-mpich, scalapack1-lam
Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -31,7 +31,7 @@ Description: Scalable Linear Algebra Package - Shared libs. for OpenMPI
Package: libscalapack-mpich1
Section: libs
-Architecture: hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: hppa m68k sh4
Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack1-mpich, scalapack1-lam
Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -49,9 +49,9 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPICH
Package: libscalapack-mpi-dev
Section: libdevel
-Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64el sparc hppa m68k powerpcspe ppc64 s390x sparc64
-Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64el sparc],
- libscalapack-mpich1 (= ${binary:Version}) [hppa m68k powerpcspe ppc64 s390x sparc64],
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa m68k sh4
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64],
+ libscalapack-mpich1 (= ${binary:Version}) [hppa m68k sh4],
libblacs-mpi-dev, ${misc:Depends}
Conflicts: scalapack-mpich-dev, scalapack-lam-dev
Replaces: scalapack-mpich-dev, scalapack-lam-dev
@@ -71,7 +71,7 @@ Description: Scalable Linear Algebra Package - Dev. files for MPICH
Package: scalapack-mpi-test
Section: math
-Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64el sparc hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64 hppa m68k sh4
Depends: scalapack-test-common, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack-mpich-test, scalapack-lam-test
Replaces: scalapack-mpich-test, scalapack-lam-test
diff --git a/debian/rules b/debian/rules
index 452ad1e..e3040b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@ SCALAPACK_MPI=$(ARCH_DEFAULT_MPI_IMPL)
# This list of archs is maintained separately from that of the mpi-defaults
# 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 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64el sparc
-MPICH_ARCHS=hppa m68k powerpcspe ppc64 s390x sparc64
+OPENMPI_ARCHS=alpha amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el sparc s390x x32 sparc64
+MPICH_ARCHS=hppa m68k sh4
build: build-$(SCALAPACK_MPI) build-pvm
@@ -49,7 +49,7 @@ build-stamp-openmpi:
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 $(shell pkg-config mpi-fort --libs) -lgfortran;\
+ lib$$i-openmpi.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-openmpi -lblacs-openmpi $(shell pkg-config mpi-fort --libs) -lgfortran -lm;\
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/* ;\
@@ -98,7 +98,7 @@ build-stamp-lam:
ar x ../$${i}_lam.a ;\
cd .. ;\
gcc -shared -Wl,-soname=lib$$i-lam.so.$(version_major) -o \
- lib$$i-lam.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-lam -lblacs-lam -llam -lgfortran;\
+ lib$$i-lam.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-lam -lblacs-lam -llam -lgfortran -lm;\
ln -snf lib$$i-lam.so.$(version) lib$$i-lam.so.$(version_major) ;\
ln -snf lib$$i-lam.so.$(version_major) lib$$i-lam.so ;\
rm tmp/* ;\
@@ -147,7 +147,7 @@ build-stamp-mpich:
ar x ../$${i}_mpich.a ;\
cd .. ;\
gcc -shared -Wl,-soname=lib$$i-mpich.so.$(version_major) -o \
- lib$$i-mpich.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich -lblacs-mpich -L /usr/lib/mpich/lib/shared -lmpich -lgfortran;\
+ lib$$i-mpich.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich -lblacs-mpich -L /usr/lib/mpich/lib/shared -lmpich -lgfortran -lm;\
ln -snf lib$$i-mpich.so.$(version) lib$$i-mpich.so.$(version_major) ;\
ln -snf lib$$i-mpich.so.$(version_major) lib$$i-mpich.so ;\
rm tmp/* ;\
@@ -190,7 +190,7 @@ build-stamp-mpich2:
ar x ../$${i}_mpich2.a ;\
cd .. ;\
gcc -shared -Wl,-soname=lib$$i-mpich2.so.$(version_major) -o \
- lib$$i-mpich2.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich2 -lblacs-mpich2 -lmpich -lmpl -lgfortran;\
+ lib$$i-mpich2.so.$(version) tmp/*.o -lblas -llapack -lblacsCinit-mpich2 -lblacs-mpich2 -lmpich -lmpl -lgfortran -lm;\
ln -snf lib$$i-mpich2.so.$(version) lib$$i-mpich2.so.$(version_major) ;\
ln -snf lib$$i-mpich2.so.$(version_major) lib$$i-mpich2.so ;\
rm tmp/* ;\
@@ -239,7 +239,7 @@ build-stamp-pvm:
ar x ../$${i}_pvm.a ;\
cd .. ;\
gcc -shared -Wl,-soname=lib$$i-pvm.so.$(version_major) -o \
- lib$$i-pvm.so.$(version) tmp/*.o -lblas -llapack -lblacs-pvm -lpvm3 -lgfortran;\
+ lib$$i-pvm.so.$(version) tmp/*.o -lblas -llapack -lblacs-pvm -lpvm3 -lgfortran -lm;\
ln -snf lib$$i-pvm.so.$(version) lib$$i-pvm.so.$(version_major) ;\
ln -snf lib$$i-pvm.so.$(version_major) lib$$i-pvm.so ;\
rm tmp/* ;\
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scalapack.git
More information about the debian-science-commits
mailing list