[elpa/f20: 2/2] initial import on f20 branch

[Dominik Mierzejewski]

commit 78a085cd54421935492ca27ef95b9bac10375566
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date:   Tue Jul 1 23:41:50 2014 +0200

    initial import on f20 branch

 elpa-atlas.patch     |    2 +-
 elpa-blacs.patch     |   21 +++++++++++++++++++++
 elpa-scalapack.patch |   12 ------------
 elpa.spec            |    7 ++++---
 4 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/elpa-atlas.patch b/elpa-atlas.patch
index d37b8bd..4871331 100644
--- a/elpa-atlas.patch
+++ b/elpa-atlas.patch
@@ -6,7 +6,7 @@ diff -up mpich/configure.ac.blacs mpich/configure.ac
  
    dnl first check blas
 -  AC_SEARCH_LIBS([dgemm],[blas],[can_link_with_blas=yes],[can_link_with_blas=no])
-+  AC_SEARCH_LIBS([dgemm],[satlas blas],[can_link_with_blas=yes],[can_link_with_blas=no])
++  AC_SEARCH_LIBS([dgemm],[f77blas blas],[can_link_with_blas=yes],[can_link_with_blas=no],[-lf77blas -latlas])
    AC_MSG_CHECKING([whether we can link a program with a blas lib])
    AC_MSG_RESULT([${can_link_with_blas}])
  
diff --git a/elpa-blacs.patch b/elpa-blacs.patch
new file mode 100644
index 0000000..44a2c01
--- /dev/null
+++ b/elpa-blacs.patch
@@ -0,0 +1,21 @@
+diff -up mpich/configure.ac.blacs mpich/configure.ac
+--- mpich/configure.ac.blacs	2014-03-21 12:10:21.000000001 +0100
++++ mpich/configure.ac	2014-06-29 22:47:36.214804126 +0200
+@@ -291,7 +291,7 @@ else
+   fi
+ 	
+   dnl now blacs
+-  AC_SEARCH_LIBS([blacs_gridinit],[mpiblacs],[can_link_with_blacs=yes],[can_link_with_blacs=no])
++  AC_SEARCH_LIBS([blacs_gridinit],[mpiblacs],[can_link_with_blacs=yes],[can_link_with_blacs=no],[-lmpiblacsF77init])
+   AC_MSG_CHECKING([whether we can link a program with a blacs lib])
+   AC_MSG_RESULT([${can_link_with_blacs}])
+ 
+@@ -300,7 +300,7 @@ else
+   fi
+ 	
+   dnl now scalapack
+-  AC_SEARCH_LIBS([pdtran],[mpiscalapack],[can_link_with_scalapack=yes],[can_link_with_scalapack=no])
++  AC_SEARCH_LIBS([pdtran],[mpiscalapack scalapack],[can_link_with_scalapack=yes],[can_link_with_scalapack=no],[-lmpiblacsF77init])
+   AC_MSG_CHECKING([whether we can link a program with a scalapack lib])
+   AC_MSG_RESULT([${can_link_with_scalapack}])
+ 
diff --git a/elpa.spec b/elpa.spec
index e3be2a8..dca466d 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -8,8 +8,8 @@ Release: 3.%{rel}%{?dist}
 URL: http://elpa.rzg.mpg.de/
 # http://elpa.rzg.mpg.de/elpa-tar-archive/elpa-2013-11.006/at_download/file
 Source0: ELPA_%{version}.%{rel}_%{snap}.tar.gz
-# fix scalapack detection on F21+
-Patch0: elpa-scalapack.patch
+# fix blacs/scalapack detection on <F21
+Patch0: elpa-blacs.patch
 # fix pkgconfig files and linking against mpi libraries
 Patch1: elpa-rpm.patch
 # build against atlas instead of reference blas
@@ -115,7 +115,7 @@ This package contains the development files for ELPA (OpenMPI version).
 %setup -q -c -T -a 0
 mv ELPA_%{version} mpich
 pushd mpich
-%patch0 -p1 -b .scalapack
+%patch0 -p1 -b .blacs
 %patch1 -p1 -b .r
 %patch2 -p1 -b .atlas
 autoreconf -vifs
@@ -126,6 +126,7 @@ cp -pr mpich openmpi _mt/
 
 %build
 export LDFLAGS="-L%{_libdir}/atlas"
+export BLACS_LDFLAGS="-lmpiblacs -lmpiblacsF77init"
 export FCFLAGS=-ffree-line-length-none
 
 %{_mpich_load}