Upgrade to 2.1.0. This now includes BLACS and PBLAS.

Also use openblas by default.

4 files changed, 12 insertions, 18 deletions

diff --git a/math/scalapack/files/patch-CMAKE_FortranMangling.cmake b/math/scalapack/files/patch-CMAKE_FortranMangling.cmake
deleted file mode 100644
index 84c3cf9e7b8e..000000000000
--- a/math/scalapack/files/patch-CMAKE_FortranMangling.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-CMake-3.13.3 requires Source and Binary directories set:
-https://gitlab.kitware.com/cmake/cmake/commit/27eb7c5bdb5bb8deefe1772675dc4819592bf036
-
---- CMAKE/FortranMangling.cmake.orig	2019-01-19 08:17:47 UTC
-+++ CMAKE/FortranMangling.cmake
-@@ -18,6 +18,7 @@ FUNCTION(COMPILE RESULT)
-     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
-     )
diff --git a/math/scalapack/files/patch-SLmake.inc.example b/math/scalapack/files/patch-SLmake.inc.example
index b2740add5e2b..01ed9b7387bf 100644
--- a/math/scalapack/files/patch-SLmake.inc.example
+++ b/math/scalapack/files/patch-SLmake.inc.example
@@ -1,5 +1,5 @@
---- SLmake.inc.example.orig	2011-11-01 18:24:54.000000000 +0100
-+++ SLmake.inc.example	2014-08-24 11:35:47.000000000 +0200
+--- SLmake.inc.example.orig	2019-11-26 20:37:04 UTC
++++ SLmake.inc.example
 @@ -20,17 +20,17 @@
  #     -DUpCase   (fortran subprogram names are upper case without any suffix)
  #     -DAdd_     (fortran subprogram names are lower case with "_" appended)
@@ -24,7 +24,7 @@
  FCLOADER      = $(FC)
  CCLOADER      = $(CC)
  FCLOADFLAGS   = $(FCFLAGS)
-@@ -55,6 +55,6 @@
+@@ -55,6 +55,6 @@ SCALAPACKLIB  = libscalapack.a
  #  BLAS, LAPACK (and possibly other) libraries needed for linking test programs
  #
  
diff --git a/math/scalapack/files/patch-scalapack.pc.in b/math/scalapack/files/patch-scalapack.pc.in
new file mode 100644
index 000000000000..57ec72006c35
--- /dev/null
+++ b/math/scalapack/files/patch-scalapack.pc.in
@@ -0,0 +1,9 @@
+--- scalapack.pc.in.orig	2019-11-26 20:37:04 UTC
++++ scalapack.pc.in
+@@ -5,5 +5,5 @@ Name: scalapack
+ Description: SCALAPACK reference implementation
+ Version: @SCALAPACK_VERSION@
+ URL: http://www.netlib.org/scalapack/
+-Libs: -L${libdir} -lscalapack
++Libs: -L${libdir} -lscalapack -lexecinfo
+ Requires: mpi lapack blas
diff --git a/math/scalapack/files/pkg-message.in b/math/scalapack/files/pkg-message.in
index 77fcda0ea8fe..2a03a710ddc3 100644
--- a/math/scalapack/files/pkg-message.in
+++ b/math/scalapack/files/pkg-message.in
@@ -8,14 +8,12 @@
 
  Example:
   % cd %%DATADIR%%/TESTING
-  % %%LOCALBASE%%/bin/mpd &
   % %%LOCALBASE%%/bin/mpirun -np 4 ./xcbrd
   % %%LOCALBASE%%/bin/mpirun -np 4 ./xcdblu
    etc., etc. ...
 
   to perform all the tests,
   % cd %%DATADIR%%/TESTING
-  % %%LOCALBASE%%/bin/mpd &
   % csh
   % foreach i (x*)
   ? %%LOCALBASE%%/bin/mpirun -np 4 ./$i >& ~/$i.log