[scalapack] 22/29: Import Debian changes 1.8.0-10
Muammar El Khatib
muammar at moszumanska.debian.org
Sun Jun 11 16:16:30 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 ae3f56563870bd106795f5e212eae9e784b04937
Author: Muammar El Khatib <muammar at debian.org>
Date: Sun Sep 21 14:33:42 2014 +0200
Import Debian changes 1.8.0-10
scalapack (1.8.0-10) unstable; urgency=medium
* FTBFS on ppc64el is fixed in this revision. Thanks to Aurelien Jarno for
seding a patch. (Closes: #761317)
* Scalapack builds with clang instead of gcc. Thanks to Sylvestre Ledru for
sending a patch. (Closes: #710395)
---
debian/changelog | 9 +++++++++
debian/control | 8 ++++----
debian/patches/29_clang.diff | 41 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
5 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e23311..6c89d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+scalapack (1.8.0-10) unstable; urgency=medium
+
+ * FTBFS on ppc64el is fixed in this revision. Thanks to Aurelien Jarno for
+ seding a patch. (Closes: #761317)
+ * Scalapack builds with clang instead of gcc. Thanks to Sylvestre Ledru for
+ sending a patch. (Closes: #710395)
+
+ -- Muammar El Khatib <muammar at debian.org> Sun, 21 Sep 2014 14:33:42 +0200
+
scalapack (1.8.0-9.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 8e8ebb2..e4d482a 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 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
Conflicts: scalapack1-mpich, scalapack1-lam
Breaks: libscalapack-mpi1 (<< 1.8.0-9.1)
@@ -49,8 +49,8 @@ Description: Scalable Linear Algebra Package - Shared libs. for MPICH
Package: libscalapack-mpi-dev
Section: libdevel
-Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
-Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc],
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Depends: libscalapack-openmpi1 (= ${binary:Version}) [alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc],
libscalapack-mpich1 (= ${binary:Version}) [arm64 hppa m68k powerpcspe ppc64 s390x sparc64],
libblacs-mpi-dev, ${misc:Depends}
Conflicts: 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 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
+Architecture: alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc arm64 hppa m68k powerpcspe ppc64 s390x sparc64
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/patches/29_clang.diff b/debian/patches/29_clang.diff
new file mode 100644
index 0000000..ae435c7
--- /dev/null
+++ b/debian/patches/29_clang.diff
@@ -0,0 +1,41 @@
+Index: scalapack-1.8.0/SLmake.inc
+===================================================================
+--- scalapack-1.8.0.orig/SLmake.inc 2013-05-30 14:56:57.000000000 +0200
++++ scalapack-1.8.0/SLmake.inc 2013-05-30 15:28:31.022005282 +0200
+@@ -130,8 +130,8 @@
+ #F77 = /usr/local/pgi/linux86/bin/pgf77
+ CC = gcc
+ NOOPT = -w $(FPIC)
+-F77FLAGS = -Wall -O6 -funroll-all-loops -ffast-math $(NOOPT)
+-CCFLAGS = -Wall $(FPIC) -O6 -funroll-all-loops -ffast-math
++F77FLAGS = -Wall -O4 -funroll-all-loops -ffast-math $(NOOPT)
++CCFLAGS = -Wall $(FPIC) -O4 -funroll-all-loops -ffast-math
+ SRCFLAG =
+ F77LOADER = $(F77)
+ ifeq ($(MPI),mpich)
+Index: scalapack-1.8.0/SRC/pdlaiect.c
+===================================================================
+--- scalapack-1.8.0.orig/SRC/pdlaiect.c 2006-01-18 22:36:03.000000000 +0100
++++ scalapack-1.8.0/SRC/pdlaiect.c 2013-05-30 15:20:08.781991452 +0200
+@@ -227,7 +227,7 @@
+ }
+ }
+
+-pdlachkieee_( isieee, rmax, rmin )
++void pdlachkieee_( isieee, rmax, rmin )
+ /*
+ * .. Scalar Arguments ..
+ */
+Index: scalapack-1.8.0/SRC/pslaiect.c
+===================================================================
+--- scalapack-1.8.0.orig/SRC/pslaiect.c 2006-01-18 22:36:03.000000000 +0100
++++ scalapack-1.8.0/SRC/pslaiect.c 2013-05-30 15:13:50.365981030 +0200
+@@ -150,7 +150,7 @@
+ }
+ }
+
+-pslachkieee_( isieee, rmax, rmin )
++void pslachkieee_( isieee, rmax, rmin )
+ /*
+ * .. Scalar Arguments ..
+ */
diff --git a/debian/patches/series b/debian/patches/series
index 63a0f0d..2de3038 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@
26_PZBLAS3TST.dat.patch
27_TRMR2D.dat.patch
28_PBtools.h.patch
+29_clang.diff
diff --git a/debian/rules b/debian/rules
index 964e159..f90d458 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ 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 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc sparc
+OPENMPI_ARCHS=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el sparc
MPICH_ARCHS=arm64 hppa m68k powerpcspe ppc64 s390x sparc64
build: build-$(SCALAPACK_MPI) build-pvm
--
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