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

Relocate rpaths for all binaries, then do text bin replacement if the rpaths still exist after running patchelf/otool (#17418)

Browse Source
This commit is contained in:
Patrick Gartung
2020-07-07 16:46:39 -05:00
committed by GitHub
parent a63761f875
commit 7f8e827db8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/spack/spack/binary_distribution.py
View File

@@ -604,13 +604,9 @@ def is_backup_file(file):
# If we are installing back to the same location don't replace anything # If we are installing back to the same location don't replace anything
if old_layout_root != new_layout_root: if old_layout_root != new_layout_root:
paths_to_relocate = [old_spack_prefix, old_layout_root] files_to_relocate = [os.path.join(workdir, filename)
paths_to_relocate.extend(prefix_to_hash.keys()) for filename in buildinfo.get('relocate_binaries')
files_to_relocate = list(filter( ]
lambda pathname: not relocate.file_is_relocatable(
pathname, paths_to_relocate=paths_to_relocate),
map(lambda filename: os.path.join(workdir, filename),
buildinfo['relocate_binaries'])))
# If the buildcache was not created with relativized rpaths # If the buildcache was not created with relativized rpaths
# do the relocation of path in binaries # do the relocation of path in binaries
if (spec.architecture.platform == 'darwin' or if (spec.architecture.platform == 'darwin' or
@@ -646,6 +642,13 @@ def is_backup_file(file):
new_spack_prefix, new_spack_prefix,
prefix_to_prefix) prefix_to_prefix)
paths_to_relocate = [old_prefix, old_layout_root]
paths_to_relocate.extend(prefix_to_hash.keys())
files_to_relocate = list(filter(
lambda pathname: not relocate.file_is_relocatable(
pathname, paths_to_relocate=paths_to_relocate),
map(lambda filename: os.path.join(workdir, filename),
buildinfo['relocate_binaries'])))
# relocate the install prefixes in binary files including dependencies # relocate the install prefixes in binary files including dependencies
relocate.relocate_text_bin(files_to_relocate, relocate.relocate_text_bin(files_to_relocate,
old_prefix, new_prefix, old_prefix, new_prefix,