Changed keyword argument 'recurse' to 'recursive'
This commit is contained in:
parent
efd2a95781
commit
e72b69732e
17 changed files with 21 additions and 19 deletions
|
@ -91,7 +91,7 @@ def libs(self):
|
||||||
libraries = ['libparpack'] + libraries
|
libraries = ['libparpack'] + libraries
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=True, recurse=True
|
libraries, root=self.prefix, shared=True, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
@when('@3.4.0:')
|
@when('@3.4.0:')
|
||||||
|
|
|
@ -142,7 +142,7 @@ def libs(self):
|
||||||
to_find = ['liblapack'] + interfaces + ['libatlas']
|
to_find = ['liblapack'] + interfaces + ['libatlas']
|
||||||
shared = False
|
shared = False
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
to_find, root=self.prefix, shared=shared, recurse=True
|
to_find, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def install_test(self):
|
def install_test(self):
|
||||||
|
|
|
@ -113,7 +113,7 @@ class Elemental(CMakePackage):
|
||||||
def libs(self):
|
def libs(self):
|
||||||
shared = True if '+shared' in self.spec else False
|
shared = True if '+shared' in self.spec else False
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
'libEl', root=self.prefix, shared=shared, recurse=True
|
'libEl', root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
@when('@0.87.6:')
|
@when('@0.87.6:')
|
||||||
|
|
|
@ -57,7 +57,7 @@ def url_for_version(self, version):
|
||||||
def libs(self):
|
def libs(self):
|
||||||
libname = 'libelpa_openmp' if '+openmp' in self.spec else 'libelpa'
|
libname = 'libelpa_openmp' if '+openmp' in self.spec else 'libelpa'
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libname, root=self.prefix, shared=True, recurse=True
|
libname, root=self.prefix, shared=True, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
build_directory = 'spack-build'
|
build_directory = 'spack-build'
|
||||||
|
|
|
@ -163,7 +163,7 @@ def libs(self):
|
||||||
libraries = query2libraries[key]
|
libraries = query2libraries[key]
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=shared, recurse=True
|
libraries, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
@run_before('configure')
|
@run_before('configure')
|
||||||
|
|
|
@ -70,7 +70,7 @@ def mpi_libs(self):
|
||||||
libraries = ['libmpicxx'] + libraries
|
libraries = ['libmpicxx'] + libraries
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=mpi_root, shared=True, recurse=True
|
libraries, root=mpi_root, shared=True, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -78,7 +78,7 @@ def mpi_headers(self):
|
||||||
# recurse from self.prefix will find too many things for all the
|
# recurse from self.prefix will find too many things for all the
|
||||||
# supported sub-architectures like 'mic'
|
# supported sub-architectures like 'mic'
|
||||||
mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64
|
mpi_root = self.prefix.compilers_and_libraries.linux.mpi.include64
|
||||||
return find_headers('mpi', root=mpi_root, recurse=False)
|
return find_headers('mpi', root=mpi_root, recursive=False)
|
||||||
|
|
||||||
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
|
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
|
||||||
spack_env.set('I_MPI_CC', spack_cc)
|
spack_env.set('I_MPI_CC', spack_cc)
|
||||||
|
|
|
@ -60,7 +60,7 @@ def libs(self):
|
||||||
libraries = ['libxcf90'] + libraries
|
libraries = ['libxcf90'] + libraries
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=shared, recurse=True
|
libraries, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
|
|
|
@ -113,4 +113,4 @@ def install(self, spec, prefix):
|
||||||
@property
|
@property
|
||||||
def libs(self):
|
def libs(self):
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
['libncurses', 'libncursesw'], root=self.prefix, recurse=True)
|
['libncurses', 'libncursesw'], root=self.prefix, recursive=True)
|
||||||
|
|
|
@ -46,5 +46,5 @@ def libs(self):
|
||||||
shared = 'shared' in query_parameters
|
shared = 'shared' in query_parameters
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=shared, recurse=True
|
libraries, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
|
@ -97,7 +97,7 @@ def blas_libs(self):
|
||||||
key = tuple(sorted(query_parameters))
|
key = tuple(sorted(query_parameters))
|
||||||
libraries = query2libraries[key]
|
libraries = query2libraries[key]
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=shared, recurse=True
|
libraries, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -120,7 +120,7 @@ def lapack_libs(self):
|
||||||
key = tuple(sorted(query_parameters))
|
key = tuple(sorted(query_parameters))
|
||||||
libraries = query2libraries[key]
|
libraries = query2libraries[key]
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=shared, recurse=True
|
libraries, root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def install_one(self, spec, prefix, shared):
|
def install_one(self, spec, prefix, shared):
|
||||||
|
|
|
@ -64,7 +64,7 @@ def scalapack_libs(self):
|
||||||
# for 'libnetlib-scalapack.<suffix>'
|
# for 'libnetlib-scalapack.<suffix>'
|
||||||
shared = True if '+shared' in self.spec else False
|
shared = True if '+shared' in self.spec else False
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
'libscalapack', root=self.prefix, shared=shared, recurse=True
|
'libscalapack', root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def cmake_args(self):
|
def cmake_args(self):
|
||||||
|
|
|
@ -229,7 +229,7 @@ def libs(self):
|
||||||
libraries = ['libmpi_cxx'] + libraries
|
libraries = ['libmpi_cxx'] + libraries
|
||||||
|
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
libraries, root=self.prefix, shared=True, recurse=True
|
libraries, root=self.prefix, shared=True, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
|
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
|
||||||
|
|
|
@ -296,7 +296,7 @@ def setup_environment(self, spack_env, run_env):
|
||||||
# performance information
|
# performance information
|
||||||
dyninst_libdir = find_libraries('libdyninstAPI_RT',
|
dyninst_libdir = find_libraries('libdyninstAPI_RT',
|
||||||
root=self.spec['dyninst'].prefix,
|
root=self.spec['dyninst'].prefix,
|
||||||
shared=True, recurse=True)
|
shared=True, recursive=True)
|
||||||
|
|
||||||
# Set Dyninst RT library path to support OSS loop resolution code
|
# Set Dyninst RT library path to support OSS loop resolution code
|
||||||
run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir)
|
run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir)
|
||||||
|
@ -304,7 +304,7 @@ def setup_environment(self, spack_env, run_env):
|
||||||
# Find openspeedshop library path
|
# Find openspeedshop library path
|
||||||
oss_libdir = find_libraries('libopenss-framework',
|
oss_libdir = find_libraries('libopenss-framework',
|
||||||
root=self.spec['openspeedshop'].prefix,
|
root=self.spec['openspeedshop'].prefix,
|
||||||
shared=True, recurse=True)
|
shared=True, recursive=True)
|
||||||
run_env.prepend_path('LD_LIBRARY_PATH',
|
run_env.prepend_path('LD_LIBRARY_PATH',
|
||||||
os.path.dirname(oss_libdir.joined()))
|
os.path.dirname(oss_libdir.joined()))
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,9 @@
|
||||||
# License along with this program; if not, write to the Free Software
|
# License along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
from spack import *
|
from spack import *
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ def libs(self):
|
||||||
libraries = ['libesmumps'] + libraries
|
libraries = ['libesmumps'] + libraries
|
||||||
|
|
||||||
scotchlibs = find_libraries(
|
scotchlibs = find_libraries(
|
||||||
libraries, root=self.prefix, recurse=True, shared=shared
|
libraries, root=self.prefix, recursive=True, shared=shared
|
||||||
)
|
)
|
||||||
if '+compression' in self.spec:
|
if '+compression' in self.spec:
|
||||||
zlibs = self.spec['zlib'].libs
|
zlibs = self.spec['zlib'].libs
|
||||||
|
|
|
@ -48,7 +48,7 @@ class Veclibfort(Package):
|
||||||
def libs(self):
|
def libs(self):
|
||||||
shared = True if '+shared' in self.spec else False
|
shared = True if '+shared' in self.spec else False
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
'libvecLibFort', root=self.prefix, shared=shared, recurse=True
|
'libvecLibFort', root=self.prefix, shared=shared, recursive=True
|
||||||
)
|
)
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
|
|
|
@ -54,7 +54,7 @@ class Zlib(Package):
|
||||||
def libs(self):
|
def libs(self):
|
||||||
shared = '+shared' in self.spec
|
shared = '+shared' in self.spec
|
||||||
return find_libraries(
|
return find_libraries(
|
||||||
['libz'], root=self.prefix, recurse=True, shared=shared
|
['libz'], root=self.prefix, recursive=True, shared=shared
|
||||||
)
|
)
|
||||||
|
|
||||||
def setup_environment(self, spack_env, run_env):
|
def setup_environment(self, spack_env, run_env):
|
||||||
|
|
Loading…
Reference in a new issue