Cleaning up
This commit is contained in:
parent
b574c4ad51
commit
cd54793913
@ -9,9 +9,10 @@ class Openssl(Package):
|
||||
homepage = "http://www.openssl.org"
|
||||
url = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz"
|
||||
|
||||
version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf')
|
||||
version('1.0.2d', '38dd619b2e77cbac69b99f52a053d25a')
|
||||
version('1.0.2e', '5262bfa25b60ed9de9f28d5d52d77fc5')
|
||||
version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf') # Not available
|
||||
version('1.0.2d', '38dd619b2e77cbac69b99f52a053d25a') # Not available
|
||||
version('1.0.2e', '5262bfa25b60ed9de9f28d5d52d77fc5') # Not available
|
||||
version('1.0.2f', 'b3bf73f507172be9292ea2a8c28b659d')
|
||||
|
||||
depends_on("zlib")
|
||||
parallel = False
|
||||
|
@ -17,7 +17,6 @@ class Trilinos(Package):
|
||||
version('11.14.2', 'a43590cf896c677890d75bfe75bc6254')
|
||||
version('11.14.1', '40febc57f76668be8b6a77b7607bb67f')
|
||||
|
||||
variant('mpi', default=True, description='Add a dependency on MPI and enables MPI dependent packages')
|
||||
variant('shared', default=True, description='Enables the build of shared libraries')
|
||||
variant('debug', default=False, description='Builds a debug version of the libraries')
|
||||
|
||||
@ -30,9 +29,8 @@ class Trilinos(Package):
|
||||
depends_on('swig')
|
||||
|
||||
# MPI related dependencies
|
||||
depends_on('mpi', when='+mpi')
|
||||
depends_on('netcdf+mpi', when='+mpi')
|
||||
depends_on('netcdf~mpi', when='~mpi')
|
||||
depends_on('mpi')
|
||||
depends_on('netcdf+mpi')
|
||||
|
||||
depends_on('python') # Needs py-numpy activated
|
||||
|
||||
@ -45,7 +43,7 @@ def install(self, spec, prefix):
|
||||
'-DTrilinos_ENABLE_EXAMPLES:BOOL=OFF',
|
||||
'-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'),
|
||||
'-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if '+shared' in spec else 'OFF'),
|
||||
'-DTPL_ENABLE_MPI:BOOL=%s' % ('ON' if '+mpi' in spec else 'OFF'),
|
||||
'-DTPL_ENABLE_MPI:STRING=ON',
|
||||
'-DBLAS_LIBRARY_DIRS:PATH=%s' % spec['blas'].prefix,
|
||||
'-DLAPACK_LIBRARY_DIRS:PATH=%s' % spec['lapack'].prefix
|
||||
])
|
||||
|
Loading…
Reference in New Issue
Block a user