From 514c61b8fe923de7eb0c41205fdfaae48afb5cdf Mon Sep 17 00:00:00 2001
From: Denis Davydov <davydden@gmail.com>
Date: Sat, 16 Jul 2016 07:28:31 +0200
Subject: hypre: don't hardcode blas/lapack/mpi; optionally run tests

---
 var/spack/repos/builtin/packages/hypre/package.py | 39 +++++++++++++++--------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index f87dae9f4e..0941d07ebe 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -46,21 +46,26 @@ class Hypre(Package):
     depends_on("lapack")
 
     def install(self, spec, prefix):
-        blas_dir = spec['blas'].prefix
-        lapack_dir = spec['lapack'].prefix
-        mpi_dir = spec['mpi'].prefix
-
-        os.environ['CC'] = os.path.join(mpi_dir, 'bin', 'mpicc')
-        os.environ['CXX'] = os.path.join(mpi_dir, 'bin', 'mpicxx')
-        os.environ['F77'] = os.path.join(mpi_dir, 'bin', 'mpif77')
-
+        os.environ['CC'] = spec['mpi'].mpicc
+        os.environ['CXX'] = spec['mpi'].mpicxx
+        os.environ['F77'] = spec['mpi'].mpif77
 
+        # Since +shared does not build on macOS and also Atlas does not have
+        # a single static lib to build against, link against shared libs with
+        # a hope that --whole-archive linker option (or alike) was used
+        # to command the linker to include whole static libs' content into the
+        # shared lib
+        # Note: --with-(lapack|blas)_libs= needs space separated list of names
         configure_args = [
-                "--prefix=%s" % prefix,
-                "--with-lapack-libs=lapack",
-                "--with-lapack-lib-dirs=%s/lib" % lapack_dir,
-                "--with-blas-libs=blas",
-                "--with-blas-lib-dirs=%s/lib" % blas_dir]
+            '--prefix=%s' % prefix,
+            '--with-lapack-libs=%s' % to_lib_name(
+                spec['lapack'].lapack_shared_lib),
+            '--with-lapack-lib-dirs=%s/lib' % spec['lapack'].prefix,
+            '--with-blas-libs=%s' % to_lib_name(
+                spec['blas'].blas_shared_lib),
+            '--with-blas-lib-dirs=%s/lib' % spec['blas'].prefix
+        ]
+
         if '+shared' in self.spec:
             configure_args.append("--enable-shared")
 
@@ -76,4 +81,12 @@ class Hypre(Package):
             configure(*configure_args)
 
             make()
+            if self.run_tests:
+                make("check")
+                make("test")
+                Executable(join_path('test', 'ij'))()
+                sstruct = Executable(join_path('test', 'struct'))
+                sstruct()
+                sstruct('-in', 'test/sstruct.in.default', '-solver', '40',
+                        '-rhsone')
             make("install")
-- 
cgit v1.2.3-70-g09d2