diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 1836ae1144f..1ca3ac00caa 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -2185,17 +2185,17 @@ def find_headers( @system_path_filter -def find_all_headers(root): - """Convenience function that returns the list of all headers found - in the directory passed as argument. +def find_all_headers(root: str) -> HeaderList: + """Convenience function that returns the list of all headers found in the directory passed as + argument. Args: - root (str): directory where to look recursively for header files + root: directory where to look recursively for header files Returns: List of all headers found in ``root`` and subdirectories. """ - return find_headers("*", root=root, recursive=True, heuristic=False, max_depth=sys.maxsize) + return find_headers("*", root=root, recursive=True) class LibraryList(FileList): diff --git a/var/spack/repos/builtin/packages/acfl/package.py b/var/spack/repos/builtin/packages/acfl/package.py index 588eb5f4ad6..033322b7c4a 100644 --- a/var/spack/repos/builtin/packages/acfl/package.py +++ b/var/spack/repos/builtin/packages/acfl/package.py @@ -415,7 +415,7 @@ def headers(self): incdir = join_path(armpl_dir, suffix) - hlist = find_all_headers(incdir) + hlist = find_headers("*", incdir) hlist.directories = [incdir] return hlist diff --git a/var/spack/repos/builtin/packages/armcomputelibrary/package.py b/var/spack/repos/builtin/packages/armcomputelibrary/package.py index d4ede5af4c9..1df9aed0568 100644 --- a/var/spack/repos/builtin/packages/armcomputelibrary/package.py +++ b/var/spack/repos/builtin/packages/armcomputelibrary/package.py @@ -139,7 +139,7 @@ def libs(self): @property def headers(self): incdir = join_path(self.spec.prefix, "include") - hlist = find_all_headers(incdir) + hlist = find_headers("*", incdir) hlist.directories = [incdir] return hlist diff --git a/var/spack/repos/builtin/packages/armpl-gcc/package.py b/var/spack/repos/builtin/packages/armpl-gcc/package.py index fbe1a99f76c..699e7446d04 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -486,7 +486,7 @@ def headers(self): incdir = join_path(armpl_dir, suffix) - hlist = find_all_headers(incdir) + hlist = find_headers("*", incdir) hlist.directories = [incdir] return hlist diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index e1fda7e9f72..a0d303732e4 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -84,6 +84,6 @@ def cmake_args(self): @property def headers(self): - headers = find_all_headers(self.prefix.include) + headers = find_headers("*", self.prefix) headers.directories = [self.prefix.include.eigen3] return headers diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 6ca7254324e..940ea7ee8f9 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -130,7 +130,7 @@ def headers(self): "elpa{suffix}-{version}".format(suffix=suffix, version=elpa_version), ) - hlist = find_all_headers(incdir) + hlist = find_headers("*", incdir) hlist.directories = [incdir] return hlist diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index 757bed4752e..19cf0ab5845 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -175,7 +175,7 @@ def libs(self): @property def headers(self): - headers = find_all_headers(self.prefix.include) + headers = find_headers("*", self.prefix) headers.directories = [self.prefix.include] return headers diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index d3ef1b8a324..29b75df0b03 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -98,6 +98,6 @@ def configure_args(self): @property def headers(self): - headers = find_all_headers(self.prefix.include) + headers = find_headers("*", self.prefix) headers.directories = [self.prefix.include] return headers diff --git a/var/spack/repos/builtin/packages/libtirpc/package.py b/var/spack/repos/builtin/packages/libtirpc/package.py index f401636a806..3789862fbcf 100644 --- a/var/spack/repos/builtin/packages/libtirpc/package.py +++ b/var/spack/repos/builtin/packages/libtirpc/package.py @@ -40,13 +40,12 @@ class Libtirpc(AutotoolsPackage): @property def headers(self): - hdrs = find_all_headers(self.prefix.include) + hdrs = find_headers("*", self.prefix) # libtirpc puts headers under include/tirpc, but some codes (e.g. hdf) # do not expect a tirpc component. Since some might, we return # both prefix.include.tirpc and prefix.include as header paths - if hdrs: - hdrs.directories = [self.prefix.include.tirpc, self.prefix.include] - return hdrs or None + hdrs.directories = [self.prefix.include.tirpc, self.prefix.include] + return hdrs def configure_args(self): # See discussion in diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 048debd6589..74f63d36f19 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -121,7 +121,7 @@ def command(self): @property def headers(self): include_dir = self.spec.prefix.include.libxml2 - hl = find_all_headers(include_dir) + hl = find_headers("*", include_dir, recursive=True) hl.directories = [include_dir, self.spec.prefix.include] return hl diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index eff9884080a..8d579b09f18 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -24,17 +24,6 @@ class Libzip(CMakePackage, AutotoolsPackage): sha256="06eb8e9141fd19e2788cabaea9c9c2fd4d488d9e1484eb474bbfcac78e7b1d88", url="https://github.com/nih-at/libzip/releases/download/rel-1-6-1/libzip-1.6.1.tar.gz", ) - # older releases are available on libzip.org - version( - "1.3.2", - sha256="ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457", - deprecated=True, - ) - version( - "1.2.0", - sha256="6cf9840e427db96ebf3936665430bab204c9ebbd0120c326459077ed9c907d9f", - deprecated=True, - ) depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated @@ -50,10 +39,3 @@ def url_for_version(self, version): build_system( conditional("cmake", when="@1.4:"), conditional("autotools", when="@:1.3"), default="cmake" ) - - @property - def headers(self): - # Up to version 1.3.0 zipconf.h was installed outside of self.prefix.include - return find_all_headers( - self.prefix if self.spec.satisfies("@:1.3.0") else self.prefix.include - ) diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 9689ae99689..04ddbab9407 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -163,6 +163,6 @@ def libs(self): @property def headers(self): - hl = find_all_headers(self.prefix.include) + hl = find_headers("*", self.prefix) hl.directories = [self.prefix.include, self.prefix.include.magics] return hl diff --git a/var/spack/repos/builtin/packages/nvpl-blas/package.py b/var/spack/repos/builtin/packages/nvpl-blas/package.py index 41895479eff..30d7d284fc9 100644 --- a/var/spack/repos/builtin/packages/nvpl-blas/package.py +++ b/var/spack/repos/builtin/packages/nvpl-blas/package.py @@ -50,7 +50,7 @@ def url_for_version(self, version): @property def blas_headers(self): - return find_all_headers(self.spec.prefix.include) + return find_headers("*", self.spec.prefix) @property def blas_libs(self): diff --git a/var/spack/repos/builtin/packages/nvpl-lapack/package.py b/var/spack/repos/builtin/packages/nvpl-lapack/package.py index b02cf4e889f..4a82bfeb7dd 100644 --- a/var/spack/repos/builtin/packages/nvpl-lapack/package.py +++ b/var/spack/repos/builtin/packages/nvpl-lapack/package.py @@ -58,7 +58,7 @@ def url_for_version(self, version): @property def lapack_headers(self): - return find_all_headers(self.spec.prefix.include) + return find_headers("*", self.spec.prefix.include) @property def lapack_libs(self):