New LAPACK + fixes for GFORTRAN 10.1

2 files changed, 28 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52a4ae0f32ad..8d00b91eb27e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,25 @@
 pkgbase = atlas-lapack
 	pkgdesc = Automatically Tuned Linear Algebra Software
 	pkgver = 3.10.3
-	pkgrel = 4
+	pkgrel = 5
 	url = http://math-atlas.sourceforge.net/
 	install = atlas-lapack.install
 	arch = x86_64
 	license = BSD
 	license = custom:lapack
-	makedepends = binutils
-	makedepends = sed
 	makedepends = gcc-fortran
 	depends = gcc-libs
 	provides = blas
 	provides = lapack
 	provides = cblas
 	provides = atlas-lapack-base
-	conflicts = blas
-	conflicts = lapack
-	conflicts = cblas
-	conflicts = atlas-lapack-base
-	conflicts = openblas
-	conflicts = openblas-lapack
-	noextract = v3.8.0.tar.gz
+	noextract = lapack-3.9.0.tar.gz
 	noextract = atlas3.10.3.tar.bz2
 	options = !makeflags
-	source = https://github.com/Reference-LAPACK/lapack/archive/v3.8.0.tar.gz
+	source = lapack-3.9.0.tar.gz::https://github.com/Reference-LAPACK/lapack/archive/v3.9.0.tar.gz
 	source = http://downloads.sourceforge.net/math-atlas/atlas3.10.3.tar.bz2
 	source = Makefile
-	sha256sums = deb22cc4a6120bff72621155a9917f485f96ef8319ac074a7afbc68aab88bcf6
+	sha256sums = 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573
 	sha256sums = 2688eb733a6c5f78a18ef32144039adcd62fabce66f2eb51dd59dde806a6d2b7
 	sha256sums = 7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69
 
diff --git a/PKGBUILD b/PKGBUILD
index 75cd36014a35..f2de3a61a907 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,23 +6,22 @@
 
 pkgname=atlas-lapack
 pkgver=3.10.3
-_lapackver=3.8.0
-pkgrel=4
+_lapackver=3.9.0
+pkgrel=5
 pkgdesc="Automatically Tuned Linear Algebra Software"
 url="http://math-atlas.sourceforge.net/"
 depends=('gcc-libs')
-makedepends=('binutils' 'sed' 'gcc-fortran')
+makedepends=('gcc-fortran')
 arch=('x86_64')
-conflicts=('blas' 'lapack' 'cblas' 'atlas-lapack-base' 'openblas' 'openblas-lapack')
-provides=("blas" "lapack" 'cblas' 'atlas-lapack-base')
+provides=('blas' 'lapack' 'cblas' 'atlas-lapack-base')
 license=('BSD' 'custom:lapack')
 options=(!makeflags)
 install=$pkgname.install
-source=("https://github.com/Reference-LAPACK/lapack/archive/v$_lapackver.tar.gz"
-        "http://downloads.sourceforge.net/math-atlas/atlas${pkgver}.tar.bz2"
+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")
-noextract=("v$_lapackver.tar.gz" "atlas$pkgver.tar.bz2")
-sha256sums=('deb22cc4a6120bff72621155a9917f485f96ef8319ac074a7afbc68aab88bcf6'
+noextract=("lapack-$_lapackver.tar.gz" "atlas$pkgver.tar.bz2")
+sha256sums=('106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573'
             '2688eb733a6c5f78a18ef32144039adcd62fabce66f2eb51dd59dde806a6d2b7'
             '7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69')
 
@@ -31,44 +30,42 @@ prepare() {
    msg 'governor(s) to "performance" and disable intel_pstate.'
    msg 'See: https://wiki.archlinux.org/index.php/CPU_frequency_scaling'
 
-   cd $srcdir
+   cd "$srcdir"
    tar -xjf atlas$pkgver.tar.bz2
    mkdir -p ATLAS/build
 }
    
 build() {
-   cd $srcdir/ATLAS/build
-
+   cd "$srcdir/ATLAS/build"
    ../configure --prefix=/usr \
                 --shared \
-                --with-netlib-lapack-tarfile="$srcdir/v$_lapackver.tar.gz"
+                --with-netlib-lapack-tarfile="$srcdir/lapack-$_lapackver.tar.gz"
    make build
    cd lib
-   cp $srcdir/Makefile .
+   cp "$srcdir/Makefile" .
    make
 }
 
 check() {
-   cd $srcdir/ATLAS/build
-
-   make check
+   cd "$srcdir/ATLAS/build"
+   make check F77FLAGS="$F77FLAGS -fallow-argument-mismatch"
    make ptcheck
    make time
 }
 
 package() {
-   cd $srcdir/ATLAS/build
-
-   make DESTDIR=$pkgdir/usr install
-   cp -d lib/*.so* $pkgdir/usr/lib
-   cd $pkgdir/usr/lib
+   cd "$srcdir/ATLAS/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"
+   install -m755 lib/libptlapack.so.3.6.1 "$pkgdir/usr/lib/libptlapack.so.$_lapackver"
+   cd "$pkgdir/usr/lib"
+   ln -s liblapack.so.$_lapackver liblapack.so.3
+   ln -s liblapack.so.3 liblapack.so
    ln -s libblas.so libblas.so.3
    ln -s libcblas.so libcblas.so.3
-   ln -s liblapack.so.3 liblapack.so
-   
    cd ../include/atlas
    sed -i "s#$srcdir# #g" *
-
-   install -Dm644 $srcdir/ATLAS/build/src/lapack/reference/LICENSE \
-      $pkgdir/usr/share/licenses/$pkgname/lapack-license.txt
+   install -Dm644 "$srcdir/ATLAS/build/src/lapack/reference/LICENSE" \
+      "$pkgdir/usr/share/licenses/$pkgname/lapack-license.txt"
 }