hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed function name and removed hardcoded libs dir

Browse source
This commit is contained in:
Gregory Becker 2016-03-18 11:55:31 -07:00
parent af7e3cadde
commit 151b04637e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/spack/spack/__init__.py
View file

@ -175,5 +175,5 @@
from spack.util.executable import * from spack.util.executable import *
__all__ += spack.util.executable.__all__ __all__ += spack.util.executable.__all__
from spack.package import flat_install, flatten_dependencies, DependencyConflictError from spack.package import install_dependency_symlinks, flatten_dependencies, DependencyConflictError
__all__ += ['flat_install', 'flatten_dependencies', 'DependencyConflictError'] __all__ += ['install_dependency_symlinks', 'flatten_dependencies', 'DependencyConflictError']

5
lib/spack/spack/package.py
View file

@ -1211,10 +1211,9 @@ def rpath_args(self):
return " ".join("-Wl,-rpath,%s" % p for p in self.rpath) return " ".join("-Wl,-rpath,%s" % p for p in self.rpath)
def flat_install(pkg, spec, prefix): def install_dependency_symlinks(pkg, spec, prefix):
"""Execute a dummy install and flatten dependencies""" """Execute a dummy install and flatten dependencies"""
os.mkdir(prefix+'/libs') flatten_dependencies(spec, prefix)
flatten_dependencies(spec, prefix+'/libs')
def flatten_dependencies(spec, flat_dir): def flatten_dependencies(spec, flat_dir):
"""Make each dependency of spec present in dir via symlink.""" """Make each dependency of spec present in dir via symlink."""