diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/llnl/util/filesystem.py | 10 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/info.py | 5 | ||||
| -rw-r--r-- | lib/spack/spack/detection/path.py | 13 |
3 files changed, 20 insertions, 8 deletions
diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 53db4bdca9..973d2f9de3 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -64,6 +64,7 @@ __all__ = [ 'is_exe', 'join_path', 'last_modification_time_recursive', + 'library_extensions', 'mkdirp', 'partition_path', 'prefixes', @@ -109,12 +110,15 @@ def path_contains_subdirectory(path, root): return norm_path.startswith(norm_root) +#: This generates the library filenames that may appear on any OS. +library_extensions = ['a', 'la', 'so', 'tbd', 'dylib'] + + def possible_library_filenames(library_names): """Given a collection of library names like 'libfoo', generate the set of - library filenames that may be found on the system (e.g. libfoo.so). This - generates the library filenames that may appear on any OS. + library filenames that may be found on the system (e.g. libfoo.so). """ - lib_extensions = ['a', 'la', 'so', 'tbd', 'dylib'] + lib_extensions = library_extensions return set( '.'.join((lib, extension)) for lib, extension in itertools.product(library_names, lib_extensions)) diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index f6273c4711..7a086dc416 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -184,8 +184,9 @@ def print_detectable(pkg): color.cprint('') color.cprint(section_title('Externally Detectable: ')) - # If the package has an 'executables' field, it can detect an installation - if hasattr(pkg, 'executables'): + # If the package has an 'executables' of 'libraries' field, it + # can detect an installation + if hasattr(pkg, 'executables') or hasattr(pkg, 'libraries'): find_attributes = [] if hasattr(pkg, 'determine_version'): find_attributes.append('version') diff --git a/lib/spack/spack/detection/path.py b/lib/spack/spack/detection/path.py index 7933114827..b56644a6b4 100644 --- a/lib/spack/spack/detection/path.py +++ b/lib/spack/spack/detection/path.py @@ -74,7 +74,8 @@ def executables_in_path(path_hints=None): def libraries_in_ld_library_path(path_hints=None): - """Get the paths of all libraries available from LD_LIBRARY_PATH. + """Get the paths of all libraries available from LD_LIBRARY_PATH, + LIBRARY_PATH, DYLD_LIBRARY_PATH, and DYLD_FALLBACK_LIBRARY_PATH. For convenience, this is constructed as a dictionary where the keys are the library paths and the values are the names of the libraries @@ -85,9 +86,15 @@ def libraries_in_ld_library_path(path_hints=None): Args: path_hints (list): list of paths to be searched. If None the list will be - constructed based on the LD_LIBRARY_PATH environment variable. + constructed based on the set of LD_LIBRARY_PATH, LIBRARY_PATH, + DYLD_LIBRARY_PATH, and DYLD_FALLBACK_LIBRARY_PATH environment + variables. """ - path_hints = path_hints or spack.util.environment.get_path('LD_LIBRARY_PATH') + path_hints = path_hints or \ + spack.util.environment.get_path('LIBRARY_PATH') + \ + spack.util.environment.get_path('LD_LIBRARY_PATH') + \ + spack.util.environment.get_path('DYLD_LIBRARY_PATH') + \ + spack.util.environment.get_path('DYLD_FALLBACK_LIBRARY_PATH') search_paths = llnl.util.filesystem.search_paths_for_libraries(*path_hints) path_to_lib = {} |