Updated to 0.3.14

2 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37d507e04385..57eb6c21ae20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencblas
 	pkgdesc = An optimized CBLAS library based on GotoBLAS2 1.13 BSD
-	pkgver = 0.3.13
+	pkgver = 0.3.14
 	pkgrel = 1
 	url = https://github.com/xianyi/OpenBLAS
 	arch = i686
@@ -8,12 +8,13 @@ pkgbase = opencblas
 	license = BSD
 	makedepends = perl
 	depends = gcc-libs
-	provides = cblas=3.8.0
+	provides = cblas=3.9.0
 	conflicts = cblas
 	options = !makeflags
 	options = !emptydirs
-	source = OpenBLAS-v0.3.13.tar.gz::https://github.com/xianyi/OpenBLAS/archive/v0.3.13.tar.gz
-	sha512sums = 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
+	options = !staticlibs
+	source = https://github.com/xianyi/OpenBLAS/releases/download/v0.3.14/OpenBLAS-0.3.14.tar.gz
+	sha512sums = c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
 
 pkgname = opencblas
 
diff --git a/PKGBUILD b/PKGBUILD
index 2582b0b8529a..06b17cbbb55e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Giuseppe Borzi <gborzi _AT_ ieee _DOT_ org>
 pkgname=opencblas
 _pkgname=OpenBLAS
-pkgver=0.3.13
+pkgver=0.3.14
 pkgrel=1
 pkgdesc="An optimized CBLAS library based on GotoBLAS2 1.13 BSD "
 arch=('i686' 'x86_64')
@@ -9,48 +9,43 @@ url="https://github.com/xianyi/OpenBLAS"
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('perl')
-provides=('cblas=3.8.0')
+provides=('cblas=3.9.0')
 conflicts=('cblas')
-options=(!makeflags !emptydirs)
-source=(${_pkgname}-v${pkgver}.tar.gz::$url/archive/v${pkgver}.tar.gz)
-sha512sums=('86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4')
+options=(!makeflags !emptydirs !staticlibs)
+source=($url/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz)
+sha512sums=('c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   unset CFLAGS
   unset CXXFLAGS
-  NPROC=`/usr/bin/grep "physical id" /proc/cpuinfo|sort|uniq|wc -l`
-  NCORE4PROC=`/usr/bin/grep "cores" /proc/cpuinfo|sort|tail -n 1|sed -e 's/cpu cores.*: //'`
-  let NCORE=NPROC*NCORE4PROC
-  make USE_OPENMP=1 NO_LAPACK=1 NUM_THREADS=$NCORE LIBPREFIX=libcblas \
-    MAJOR_VERSION=3 ONLY_CBLAS=1 NO_AFFINITY=1 libs shared
+  make NO_STATIC=1 NO_LAPACK=1 NO_LAPACKE=1 ONLY_CBLAS=1 NO_AFFINITY=1 \
+       USE_OPENMP=1 TARGET=CORE2 DYNAMIC_ARCH=1 LIBPREFIX=libcblas \
+       NUM_THREADS=64 MAJOR_VERSION=3 libs shared
 }
 
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  NPROC=`/usr/bin/grep "physical id" /proc/cpuinfo|sort|uniq|wc -l`
-  NCORE4PROC=`/usr/bin/grep "cores" /proc/cpuinfo|sort|tail -n 1|sed -e 's/cpu cores.*: //'`
-  let NCORE=NPROC*NCORE4PROC
-  make PREFIX="$pkgdir/usr" NUM_THREADS=$NCORE LIBPREFIX=libcblas \
+  make PREFIX="$pkgdir/usr" NUM_THREADS=64 LIBPREFIX=libcblas \
     MAJOR_VERSION=3 install
-  rm -f "$pkgdir"/usr/include/lapacke* "$pkgdir"/usr/include/f77blas.h
+  rm -f "$pkgdir"/usr/include/lapack* "$pkgdir"/usr/include/f77blas.h
   mv "$pkgdir"/usr/include/openblas_config.h "$pkgdir"/usr/include/opencblas_config.h
   sed -i -e 's/openblas_config/opencblas_config/' "$pkgdir"/usr/include/cblas.h
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/lib/"
-  ln -sf libcblas_*-r$pkgver.a libcblas.a
-  ln -sf libcblas_*-r$pkgver.so libcblas.so
-  ln -sf libcblas_*-r$pkgver.so libcblas.so.3
   mv "$pkgdir/usr/lib/cmake/openblas" "$pkgdir/usr/lib/cmake/opencblas"
   mv "$pkgdir/usr/lib/cmake/opencblas/OpenBLASConfig.cmake" "$pkgdir/usr/lib/cmake/opencblas/OpenCBLASConfig.cmake"
+  mv "$pkgdir/usr/lib/cmake/opencblas/OpenBLASConfigVersion.cmake" "$pkgdir/usr/lib/cmake/opencblas/OpenCBLASConfigVersion.cmake"
   sed -i -e "s%$pkgdir%%" "$pkgdir/usr/lib/cmake/opencblas/OpenCBLASConfig.cmake"
   sed -i -e "s/OpenBLAS_/OpenCBLAS_/" "$pkgdir/usr/lib/cmake/opencblas/OpenCBLASConfig.cmake"
   mv "$pkgdir/usr/lib/pkgconfig/openblas.pc" "$pkgdir/usr/lib/pkgconfig/opencblas.pc"
   sed -i -e "s%$pkgdir%%" "$pkgdir/usr/lib/pkgconfig/opencblas.pc"
   sed -i -e "s/openblas/opencblas/" "$pkgdir/usr/lib/pkgconfig/opencblas.pc"
+  sed -i -e "s/-lgfortran//g" "$pkgdir/usr/lib/pkgconfig/opencblas.pc"
+  ln -s opencblas.pc "$pkgdir"/usr/lib/pkgconfig/cblas.pc
 }
 
 # vim:set ts=2 sw=2 et: