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

Dependency libs: filter system paths and always add lib dir (#10622)

Browse Source 
Fixes #10617
Fixes #10624
Closes: #10619

#8136 dependended entirely on spec.libs to retrieve library directories
from dependencies. By default this function only retrieves libraries if
their name is something like lib<package> (e.g. "libfoo.so" for a
package called "Foo"). This unconditionally adds lib/lib64 directories
for each dependency as link/rpath directories. 

This also filters system paths from link/rpaths/include directories and
removes duplicated paths that #8136 could add.
This commit is contained in:
Peter Scheibel 2019-02-15 17:21:35 -06:00 committed by GitHub
parent 9b1690641b
commit 32ba471816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/spack/spack/build_environment.py
View File

@ -45,6 +45,7 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.tty.color import cescape, colorize from llnl.util.tty.color import cescape, colorize
from llnl.util.filesystem import mkdirp, install, install_tree from llnl.util.filesystem import mkdirp, install, install_tree
from llnl.util.lang import dedupe
import spack.build_systems.cmake import spack.build_systems.cmake
import spack.build_systems.meson import spack.build_systems.meson
@ -275,18 +276,22 @@ def set_build_environment_variables(pkg, env, dirty):
for dep in link_deps: for dep in link_deps:
if is_system_path(dep.prefix): if is_system_path(dep.prefix):
continue continue
# TODO: packages with alternative implementations of .libs which
# are external may place libraries in nonstandard directories, so
# there should be a check for that
query = pkg.spec[dep.name] query = pkg.spec[dep.name]
dep_link_dirs = list()
try: try:
dep_link_dirs = list(query.libs.directories) dep_link_dirs.extend(query.libs.directories)
link_dirs.extend(dep_link_dirs)
if dep in rpath_deps:
rpath_dirs.extend(dep_link_dirs)
except spack.spec.NoLibrariesError: except spack.spec.NoLibrariesError:
tty.debug("No libraries found for {0}".format(dep.name)) tty.debug("No libraries found for {0}".format(dep.name))
for default_lib_dir in ['lib', 'lib64']:
default_lib_prefix = os.path.join(dep.prefix, default_lib_dir)
if os.path.isdir(default_lib_prefix):
dep_link_dirs.append(default_lib_prefix)
link_dirs.extend(dep_link_dirs)
if dep in rpath_deps:
rpath_dirs.extend(dep_link_dirs)
# TODO: fix the line below, currently the logic is broken for # TODO: fix the line below, currently the logic is broken for
# TODO: packages that uses directories as namespaces e.g. # TODO: packages that uses directories as namespaces e.g.
# TODO: #include <boost/xxx.hpp> # TODO: #include <boost/xxx.hpp>
@ -295,6 +300,10 @@ def set_build_environment_variables(pkg, env, dirty):
if os.path.isdir(dep.prefix.include): if os.path.isdir(dep.prefix.include):
include_dirs.append(dep.prefix.include) include_dirs.append(dep.prefix.include)
link_dirs = list(dedupe(filter_system_paths(link_dirs)))
include_dirs = list(dedupe(filter_system_paths(include_dirs)))
rpath_dirs = list(dedupe(filter_system_paths(rpath_dirs)))
env.set(SPACK_LINK_DIRS, ':'.join(link_dirs)) env.set(SPACK_LINK_DIRS, ':'.join(link_dirs))
env.set(SPACK_INCLUDE_DIRS, ':'.join(include_dirs)) env.set(SPACK_INCLUDE_DIRS, ':'.join(include_dirs))
env.set(SPACK_RPATH_DIRS, ':'.join(rpath_dirs)) env.set(SPACK_RPATH_DIRS, ':'.join(rpath_dirs))