zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slepc: switch from using -with-arpack-dir to --with-arpack-include/lib options (#28654)

Browse Source 
Also save configure.log, make.log
This commit is contained in:
Satish Balay 2022-01-28 04:20:35 -06:00 committed by GitHub
parent 46b9911289
commit 4c3bc0d3dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
var/spack/repos/builtin/packages/slepc/package.py
View File

@ -113,21 +113,23 @@ def install(self, spec, prefix):
options = []
if '+arpack' in spec:
options.extend([
'--with-arpack-dir=%s' % spec['arpack-ng'].prefix,
])
if spec.satisfies('@:3.12'):
arpackopt = '--with-arpack-flags'
else:
arpackopt = '--with-arpack-lib'
if 'arpack-ng~mpi' in spec:
if spec.satisfies('@3.15:'):
options.extend([
arpackopt + '=-larpack'
'--with-arpack-include=%s' % spec['arpack-ng'].prefix.include,
'--with-arpack-lib=%s' % spec['arpack-ng'].libs.joined()
])
else:
if spec.satisfies('@:3.12'):
arpackopt = '--with-arpack-flags'
else:
arpackopt = '--with-arpack-lib'
if 'arpack-ng~mpi' in spec:
arpacklib = '-larpack'
else:
arpacklib = '-lparpack,-larpack'
options.extend([
arpackopt + '=-lparpack,-larpack'
'--with-arpack-dir=%s' % spec['arpack-ng'].prefix,
'%s=%s' % (arpackopt, arpacklib)
])
# It isn't possible to install BLOPEX separately and link to it;
@ -152,6 +154,11 @@ def setup_dependent_build_environment(self, env, dependent_spec):
# Set up SLEPC_DIR for dependent packages built with SLEPc
env.set('SLEPC_DIR', self.prefix)
@property
def archive_files(self):
return [join_path(self.stage.source_path, 'configure.log'),
join_path(self.stage.source_path, 'make.log')]
def run_hello_test(self):
"""Run stand alone test: hello"""
test_dir = self.test_suite.current_test_data_dir