patch from #comment-861959

3 files changed, 57 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d00b0591ed6f..5b4c763ccf17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = atlas-lapack
 	pkgdesc = Automatically Tuned Linear Algebra Software
 	pkgver = 3.10.3
-	pkgrel = 6
+	pkgrel = 7
 	url = http://math-atlas.sourceforge.net
 	install = atlas-lapack.install
 	arch = x86_64
@@ -20,8 +20,10 @@ pkgbase = atlas-lapack
 	source = lapack-3.10.0.tar.gz::https://github.com/Reference-LAPACK/lapack/archive/v3.10.0.tar.gz
 	source = http://downloads.sourceforge.net/math-atlas/atlas3.10.3.tar.bz2
 	source = Makefile
+	source = gfortran-10.patch
 	sha256sums = 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19
 	sha256sums = 2688eb733a6c5f78a18ef32144039adcd62fabce66f2eb51dd59dde806a6d2b7
 	sha256sums = 7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69
+	sha256sums = 33dbb696ab88cf8df2b7fcebbbd60c01b0a26afdd5df4be2d8b344a7bfcdc12f
 
 pkgname = atlas-lapack
diff --git a/PKGBUILD b/PKGBUILD
index 51567495447d..6e60f50dbdbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,10 @@
 # Contributor: olivier medoc <o_medoc___AT___yahoo___DOT___fr>
 
 pkgname=atlas-lapack
+_PKGNAME=ATLAS
 pkgver=3.10.3
 _lapackver=3.10.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Automatically Tuned Linear Algebra Software"
 url="http://math-atlas.sourceforge.net"
 depends=('gcc-libs')
@@ -17,11 +18,13 @@ provides=('blas' 'lapack' 'cblas' 'atlas-lapack-base')
 license=('BSD' 'custom:lapack')
 source=("lapack-$_lapackver.tar.gz::https://github.com/Reference-LAPACK/lapack/archive/v$_lapackver.tar.gz"
         "http://downloads.sourceforge.net/math-atlas/atlas$pkgver.tar.bz2"
-        "Makefile")
+        "Makefile"
+        "gfortran-10.patch")
 noextract=("lapack-$_lapackver.tar.gz" "atlas$pkgver.tar.bz2")
 sha256sums=('328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19'
             '2688eb733a6c5f78a18ef32144039adcd62fabce66f2eb51dd59dde806a6d2b7'
-            '7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69')
+            '7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69'
+            '33dbb696ab88cf8df2b7fcebbbd60c01b0a26afdd5df4be2d8b344a7bfcdc12f')
 options=(!makeflags !buildflags)
 install=$pkgname.install
 
@@ -32,11 +35,14 @@ prepare() {
   
   cd "$srcdir"
   tar -xjf atlas$pkgver.tar.bz2
-  mkdir -p ATLAS/build
+  mkdir -p $_PKGNAME/build
+
+  cd $_PKGNAME
+  patch -p1 < "$srcdir/gfortran-10.patch"
 }
    
 build() {
-  cd "$srcdir/ATLAS/build"
+  cd "$srcdir/$_PKGNAME/build"
   ../configure --prefix=/usr \
                --shared \
                --with-netlib-lapack-tarfile="$srcdir/lapack-$_lapackver.tar.gz"
@@ -47,14 +53,14 @@ build() {
 }
 
 check() {
-  cd "$srcdir/ATLAS/build"
+  cd "$srcdir/$_PKGNAME/build"
   make check F77FLAGS="$F77FLAGS -fallow-argument-mismatch"
   make ptcheck
   make time
 }
 
 package() {
-  cd "$srcdir/ATLAS/build"
+  cd "$srcdir/$_PKGNAME/build"
   make DESTDIR="$pkgdir/usr" install
   cp -d lib/*.so "$pkgdir/usr/lib"
   install -m755 lib/liblapack.so.3.6.1 "$pkgdir/usr/lib/liblapack.so.$_lapackver"
@@ -66,6 +72,6 @@ package() {
   ln -s libcblas.so libcblas.so.3
   cd ../include/atlas
   sed -i "s#$srcdir# #g" *
-  install -Dm644 "$srcdir/ATLAS/build/src/lapack/reference/LICENSE" \
+  install -Dm644 "$srcdir/$_PKGNAME/build/src/lapack/reference/LICENSE" \
      "$pkgdir/usr/share/licenses/$pkgname/lapack-license.txt"
 }
diff --git a/gfortran-10.patch b/gfortran-10.patch
new file mode 100644
index 000000000000..9983d99b0273
--- /dev/null
+++ b/gfortran-10.patch
@@ -0,0 +1,40 @@
+Description: Fix FTBFS with gfortran 10
+Origin: other, https://github.com/Reference-LAPACK/lapack/commit/7fb63b1cd386b099d7da6eeaafc3e7dce055a7d0
+Bug-Debian: https://bugs.debian.org/957015
+Forwarded: no
+Reviewed-by: Sébastien Villemot <sebastien@debian.org>
+Last-Update: 2020-05-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/interfaces/blas/C/testing/c_dblat1.f
++++ b/interfaces/blas/C/testing/c_dblat1.f
+@@ -247,11 +247,11 @@
+             IF (ICASE.EQ.7) THEN
+ *              .. DNRM2TEST ..
+                STEMP(1) = DTRUE1(NP1)
+-               CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC)
++               CALL STEST1(DNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
+             ELSE IF (ICASE.EQ.8) THEN
+ *              .. DASUMTEST ..
+                STEMP(1) = DTRUE3(NP1)
+-               CALL STEST1(DASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC)
++               CALL STEST1(DASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
+             ELSE IF (ICASE.EQ.9) THEN
+ *              .. DSCALTEST ..
+                CALL DSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX)
+--- a/interfaces/blas/C/testing/c_sblat1.f
++++ b/interfaces/blas/C/testing/c_sblat1.f
+@@ -247,11 +247,11 @@
+             IF (ICASE.EQ.7) THEN
+ *              .. SNRM2TEST ..
+                STEMP(1) = DTRUE1(NP1)
+-               CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP,STEMP,SFAC)
++               CALL STEST1(SNRM2TEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
+             ELSE IF (ICASE.EQ.8) THEN
+ *              .. SASUMTEST ..
+                STEMP(1) = DTRUE3(NP1)
+-               CALL STEST1(SASUMTEST(N,SX,INCX),STEMP,STEMP,SFAC)
++               CALL STEST1(SASUMTEST(N,SX,INCX),STEMP(1),STEMP,SFAC)
+             ELSE IF (ICASE.EQ.9) THEN
+ *              .. SSCALTEST ..
+                CALL SSCALTEST(N,SA((INCX-1)*5+NP1),SX,INCX)