bump to 0.3.20

3 files changed, 8 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7017d5ddec88..95ecb16ec549 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openblas-lapack
 	pkgdesc = Optimized BLAS library based on GotoBLAS2 1.13 BSD (providing blas, lapack, and cblas)
-	pkgver = 0.3.19
-	pkgrel = 3
+	pkgver = 0.3.20
+	pkgrel = 1
 	url = http://www.openblas.net/
 	arch = x86_64
 	license = BSD
@@ -19,9 +19,7 @@ pkgbase = openblas-lapack
 	conflicts = cblas
 	conflicts = lapacke
 	options = !emptydirs
-	source = OpenBLAS-0.3.19.tar.gz::https://github.com/xianyi/OpenBLAS/archive/v0.3.19.tar.gz
-	source = 3504.patch
-	sha256sums = 947f51bfe50c2a0749304fbe373e00e7637600b0a47b78a51382aeb30ca08562
-	sha256sums = 972aa53d2fbbe76b46a1cd1a9e53ddfeb42968e701e0cb8894a5bc3c1072847d
+	source = OpenBLAS-0.3.20.tar.gz::https://github.com/xianyi/OpenBLAS/archive/v0.3.20.tar.gz
+	sha256sums = 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
 
 pkgname = openblas-lapack
diff --git a/3504.patch b/3504.patch
deleted file mode 100644
index 42db2856196e..000000000000
--- a/3504.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b329e45288c2e7fc0ef15c4e8a7b3c8dfd74a930 Mon Sep 17 00:00:00 2001
-From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
-Date: Sat, 1 Jan 2022 00:46:23 +0100
-Subject: [PATCH] Guard against omp_get_num_places returning zero
-
----
- driver/others/memory.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/driver/others/memory.c b/driver/others/memory.c
-index bd0553ca9d..0f4cbb24d4 100644
---- a/driver/others/memory.c
-+++ b/driver/others/memory.c
-@@ -232,11 +232,11 @@ int get_num_procs(void);
- #else
- int get_num_procs(void) {
-   static int nums = 0;
--
-+  int ret;
- #if defined(__GLIBC_PREREQ)
-   cpu_set_t cpuset,*cpusetp;
-   size_t size;
--  int ret;
-+
- #if !__GLIBC_PREREQ(2, 7)
-   int i;
- #if !__GLIBC_PREREQ(2, 6)
-@@ -249,7 +249,8 @@ int get_num_procs(void) {
- 
- #if defined(USE_OPENMP)
- #if _OPENMP >= 201511
--    nums = omp_get_num_places();
-+    ret = omp_get_num_places();
-+    if (ret >0 ) nums = ret;
- #endif
-     return nums;
- #endif
-@@ -1800,11 +1801,12 @@ int get_num_procs(void);
- int get_num_procs(void) {
- 
-   static int nums = 0;
--
-+  int ret;
-+	
- #if defined(__GLIBC_PREREQ)
-   cpu_set_t cpuset,*cpusetp;
-   size_t size;
--  int ret;
-+
- #if !__GLIBC_PREREQ(2, 7)
-   int i;
- #if !__GLIBC_PREREQ(2, 6)
-@@ -1818,7 +1820,8 @@ int get_num_procs(void) {
- #if defined(USE_OPENMP)
- /*  if (omp_get_proc_bind() != omp_proc_bind_false) */
- #if _OPENMP >= 201511
--    nums = omp_get_num_places();	  
-+    ret = omp_get_num_places();
-+    if (ret >0 ) nums = ret;
- #endif
-     return nums;
- #endif
diff --git a/PKGBUILD b/PKGBUILD
index 2bacd2910657..de54644dfe8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
 pkgname=openblas-lapack
 _PkgName=OpenBLAS
 _pkgname=openblas
-pkgver=0.3.19
+pkgver=0.3.20
 # grep VERSION "${srcdir}/${_PkgName}-${pkgver}"/lapack-netlib/README.md | tail -n 1 | cut -d ' ' -f 2
 _lapackver=3.9.0
 _blasver=3.8.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Optimized BLAS library based on GotoBLAS2 1.13 BSD (providing blas, lapack, and cblas)"
 arch=('x86_64')
 url="http://www.openblas.net/"
@@ -20,10 +20,8 @@ makedepends=('perl' 'gcc-fortran')
 provides=('openblas' "blas=${_blasver}" "lapack=${_lapackver}" "cblas=${_blasver}" "lapacke=${_lapackver}")
 conflicts=('openblas' 'blas' 'lapack' 'cblas' 'lapacke')
 options=(!emptydirs)
-source=(${_PkgName}-${pkgver}.tar.gz::https://github.com/xianyi/${_PkgName}/archive/v${pkgver}.tar.gz
-  3504.patch)
-sha256sums=('947f51bfe50c2a0749304fbe373e00e7637600b0a47b78a51382aeb30ca08562'
-            '972aa53d2fbbe76b46a1cd1a9e53ddfeb42968e701e0cb8894a5bc3c1072847d')
+source=(${_PkgName}-${pkgver}.tar.gz::https://github.com/xianyi/${_PkgName}/archive/v${pkgver}.tar.gz)
+sha256sums=('8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c')
 
 # Add the following line to the _config variable if you want to set the number of make jobs
 #  MAKE_NB_JOBS=2 \
@@ -32,11 +30,6 @@ _config="FC=gfortran USE_OPENMP=1 USE_THREAD=1 \
   NO_LAPACK=0 BUILD_LAPACK_DEPRECATED=1 \
   MAJOR_VERSION=${_lapackver:0:1} NO_STATIC=1"
 
-prepare(){
-  cd "${_PkgName}-${pkgver}"
-  patch -p1 -i ../3504.patch
-}
-
 build(){
   cd "${srcdir}/${_PkgName}-${pkgver}"