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

Allow find_libraries to accept lists or strings (#3363)

Browse Source 
* Allow find_libraries to accept lists or strings

* Convert one more example from list to string
This commit is contained in:
Adam J. Stewart
2017-03-04 11:23:57 -06:00
committed by GitHub
parent 192a4b30f0
commit a2d70a45fb
10 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/octopus/package.py
View File

@@ -38,7 +38,7 @@ class Octopus(Package):
# Sample url is:
# "http://www.tddft.org/programs/octopus/down.php?file=5.0.1/octopus-5.0.1.tar.gz"
def url_for_version(self, version):
return '{0}/{1}/octopus-{1}.tar.gz'.format(Octopus.base_url,
return '{0}/{1}/octopus-{1}.tar.gz'.format(Octopus.base_url,
version.dotted)
variant('scalapack', default=False,
@@ -69,7 +69,7 @@ def url_for_version(self, version):
# feast, libfm, pfft, isf, pnfft
def install(self, spec, prefix):
arpack = find_libraries(['libarpack'], root=spec[
arpack = find_libraries('libarpack', root=spec[
'arpack-ng'].prefix.lib, shared=True)
lapack = spec['lapack'].libs
blas = spec['blas'].libs
@@ -96,12 +96,12 @@ def install(self, spec, prefix):
if '+netcdf' in spec:
args.extend([
'--with-netcdf-prefix=%s' % spec['netcdf-fortran'].prefix,
'--with-netcdf-include=%s' %
'--with-netcdf-include=%s' %
spec['netcdf-fortran'].prefix.include,
])
if '+arpack-ng' in spec:
args.extend([
'--with-arpack={0}'.format(arpack.joined()),
'--with-arpack={0}'.format(arpack.joined()),
])
if '+scalapack' in spec:
args.extend([