added cmake 3.13.3 related patch

3 files changed, 30 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1d1f677667d..b030309e989a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scalapack
 	pkgdesc = subset of scalable LAPACK routines redesigned for distributed memory MIMD parallel computers.
 	pkgver = 2.0.2
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.netlib.org/scalapack/
 	install = scalapack.install
 	arch = i686
@@ -18,10 +18,12 @@ pkgbase = scalapack
 	source = http://www.netlib.org/scalapack/manpages.tgz
 	source = Makefile
 	source = example1.f
-	md5sums = 2f75e600a2ba155ed9ce974a1c4b536f
-	md5sums = a536ab4837ec68addff0a3ec99427a10
-	md5sums = 0bef36150ffaf341a6228b474ed800c9
-	md5sums = 4723ad431356431bb193db254b6ee0fb
+	source = cmake3.13.3.patch
+	sha256sums = 0c74aeae690fe5ee4db7926f49c5d0bb69ce09eea75beb915e00bba07530395c
+	sha256sums = a745c9f367d65e3c7611c126597a4681094b002552e47b621964d30a966aac7b
+	sha256sums = 5f7e81c1c76fc010677fd446bfc689c7f6af1a22a51093e8790e8a615159c541
+	sha256sums = d9904ecb69f318c4782c0bd39ff2bff511af31960a2383a9d42d6620a266ea70
+	sha256sums = 3c3b2e60473394e8594854251eab1035fc31643fe17b26f49aa7b31d5b6903c3
 
 pkgname = scalapack
 
diff --git a/PKGBUILD b/PKGBUILD
index fa3d8ba23e45..6008e46a4f96 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,26 @@
 
 pkgname=scalapack
 pkgver=2.0.2
-pkgrel=5
+pkgrel=6
+arch=('i686' 'x86_64')
 pkgdesc="subset of scalable LAPACK routines redesigned for distributed memory MIMD parallel computers."
 url="http://www.netlib.org/scalapack/"
 license=('custom')
 depends=('glibc' 'openmpi' 'blas' 'lapack') # 'atlas-lapack' 'blacs-openmpi' )
 makedepends=('cmake' 'gcc-fortran')
 provides=('blacs')
-conflicts=()
-replaces=()
-backup=()
-arch=('i686' 'x86_64')
 install=${pkgname}.install
-source=(http://www.netlib.org/scalapack/$pkgname-$pkgver.tgz http://www.netlib.org/scalapack/manpages.tgz Makefile example1.f)
-md5sums=('2f75e600a2ba155ed9ce974a1c4b536f'
-         'a536ab4837ec68addff0a3ec99427a10'
-         '0bef36150ffaf341a6228b474ed800c9'
-         '4723ad431356431bb193db254b6ee0fb')
+source=(http://www.netlib.org/scalapack/$pkgname-$pkgver.tgz http://www.netlib.org/scalapack/manpages.tgz Makefile example1.f cmake3.13.3.patch)
+sha256sums=('0c74aeae690fe5ee4db7926f49c5d0bb69ce09eea75beb915e00bba07530395c'
+            'a745c9f367d65e3c7611c126597a4681094b002552e47b621964d30a966aac7b'
+            '5f7e81c1c76fc010677fd446bfc689c7f6af1a22a51093e8790e8a615159c541'
+            'd9904ecb69f318c4782c0bd39ff2bff511af31960a2383a9d42d6620a266ea70'
+            '3c3b2e60473394e8594854251eab1035fc31643fe17b26f49aa7b31d5b6903c3')
+
+prepare() {
+  cd ${pkgname}-${pkgver}/CMAKE
+  patch -Np0 < "$srcdir"/cmake3.13.3.patch
+}
 
 build() {
     msg "Starting make..."
diff --git a/cmake3.13.3.patch b/cmake3.13.3.patch
new file mode 100644
index 000000000000..5818341daba3
--- /dev/null
+++ b/cmake3.13.3.patch
@@ -0,0 +1,10 @@
+--- FortranMangling.cmake       (revision 211)
++++ FortranMangling.cmake       (working copy)
+@@ -18,6 +18,7 @@
+     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}  
+          "-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}"
+          "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
++         ${PROJECT_SOURCE_DIR}/BLACS/INSTALL/
+         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/BLACS/INSTALL/        
+         RESULT_VARIABLE RESVAR OUTPUT_VARIABLE LOG1 ERROR_VARIABLE LOG1
+     )