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

Python: add both lib and lib64 to PYTHONPATH (#18523)

Browse source
This commit is contained in:
Adam J. Stewart 2020-10-12 19:59:20 -05:00 committed by GitHub
parent 82a224b0da
commit cb4e30b477
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/python/package.py
View file

@ -929,11 +929,14 @@ def setup_dependent_build_environment(self, env, dependent_spec):
env.prepend_path('PATH', path) env.prepend_path('PATH', path)
python_paths = [] python_paths = []
for d in dependent_spec.traverse( for d in dependent_spec.traverse(deptype=('build', 'run', 'test')):
deptype=('build', 'run', 'test')):
if d.package.extends(self.spec): if d.package.extends(self.spec):
python_paths.append(join_path(d.prefix, # Python libraries may be installed in lib or lib64
self.site_packages_dir)) # See issues #18520 and #17126
for lib in ['lib', 'lib64']:
python_paths.append(join_path(
d.prefix, lib, 'python' + str(self.version.up_to(2)),
'site-packages'))
pythonpath = ':'.join(python_paths) pythonpath = ':'.join(python_paths)
env.set('PYTHONPATH', pythonpath) env.set('PYTHONPATH', pythonpath)
@ -942,8 +945,10 @@ def setup_dependent_run_environment(self, env, dependent_spec):
# For run time environment set only the path for # For run time environment set only the path for
# dependent_spec and prepend it to PYTHONPATH # dependent_spec and prepend it to PYTHONPATH
if dependent_spec.package.extends(self.spec): if dependent_spec.package.extends(self.spec):
for lib in ['lib', 'lib64']:
env.prepend_path('PYTHONPATH', join_path( env.prepend_path('PYTHONPATH', join_path(
dependent_spec.prefix, self.site_packages_dir)) dependent_spec.prefix, lib,
'python' + str(self.version.up_to(2)), 'site-packages'))
def setup_dependent_package(self, module, dependent_spec): def setup_dependent_package(self, module, dependent_spec):
"""Called before python modules' install() methods. """Called before python modules' install() methods.