From 98949bd79b18d1cd33e67314a893e46a2beb4958 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 28 Feb 2018 20:15:26 +0100 Subject: [PATCH] change recurse into recursive in a few places (#7342) --- var/spack/repos/builtin/packages/bzip2/package.py | 2 +- var/spack/repos/builtin/packages/fftw/package.py | 2 +- .../repos/builtin/packages/intel-parallel-studio/package.py | 4 ++-- var/spack/repos/builtin/packages/libxsmm/package.py | 4 ++-- var/spack/repos/builtin/packages/netcdf-cxx/package.py | 2 +- var/spack/repos/builtin/packages/netcdf-cxx4/package.py | 2 +- var/spack/repos/builtin/packages/netlib-xblas/package.py | 2 +- var/spack/repos/builtin/packages/opencv/package.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 53ed853310..d9b81324e5 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -45,7 +45,7 @@ class Bzip2(Package): def libs(self): shared = '+shared' in self.spec return find_libraries( - 'libbz2', root=self.prefix, shared=shared, recurse=True + 'libbz2', root=self.prefix, shared=shared, recursive=True ) def patch(self): diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 87dc0cbba3..d33439ee18 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -118,7 +118,7 @@ def libs(self): libraries.append('libfftw3' + sfx) - return find_libraries(libraries, root=self.prefix, recurse=True) + return find_libraries(libraries, root=self.prefix, recursive=True) def autoreconf(self, spec, prefix): if '+pfft_patches' in spec: diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index fc399e5d24..e49a5a8005 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -258,7 +258,7 @@ def mpi_libs(self): libraries = ['libmpicxx'] + libraries return find_libraries( - libraries, root=mpi_root, shared=True, recurse=True + libraries, root=mpi_root, shared=True, recursive=True ) @property @@ -266,7 +266,7 @@ def mpi_headers(self): # recurse from self.prefix will find too many things for all the # supported sub-architectures like 'mic' 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) @property def components(self): diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 3cde61147f..3a3a2087dd 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -68,10 +68,10 @@ class Libxsmm(MakefilePackage): @property def libs(self): result = find_libraries(['libxsmm', 'libxsmmf'], root=self.prefix, - recurse=True) + recursive=True) if len(result) == 0: result = find_libraries(['libxsmm', 'libxsmmf'], root=self.prefix, - shared=False, recurse=True) + shared=False, recursive=True) return result def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index f3bb4e6135..a87e3e7644 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -42,5 +42,5 @@ class NetcdfCxx(AutotoolsPackage): def libs(self): shared = True return find_libraries( - 'libnetcdf_c++', root=self.prefix, shared=shared, recurse=True + 'libnetcdf_c++', root=self.prefix, shared=shared, recursive=True ) diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index 3c68538f0b..7cd2cdca3e 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -45,5 +45,5 @@ class NetcdfCxx4(AutotoolsPackage): def libs(self): shared = True return find_libraries( - 'libnetcdf_c++4', root=self.prefix, shared=shared, recurse=True + 'libnetcdf_c++4', root=self.prefix, shared=shared, recursive=True ) diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index cde2a94658..e24f7879d6 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -54,7 +54,7 @@ class NetlibXblas(AutotoolsPackage): @property def libs(self): return find_libraries(['libxblas'], root=self.prefix, - shared=False, recurse=True) + shared=False, recursive=True) def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index c7082bb194..8a16894e68 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -234,5 +234,5 @@ def cmake_args(self): def libs(self): shared = "+shared" in self.spec return find_libraries( - "libopencv_*", root=self.prefix, shared=shared, recurse=True + "libopencv_*", root=self.prefix, shared=shared, recursive=True )