diff options
| author | Patrick Gartung <gartung@fnal.gov> | 2020-07-07 16:46:39 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2020-07-27 11:28:50 -0700 |
| commit | ce772420dd32dfc9b1a170db39554eae9798ca14 (patch) | |
| tree | 5303669d2ad40ad26ae2fec9a7dd943c4bae9708 | |
| parent | 9cc01dc57467223570cb924bc095fc0ea2f52ffa (diff) | |
| download | spack-ce772420dd32dfc9b1a170db39554eae9798ca14.tar.gz spack-ce772420dd32dfc9b1a170db39554eae9798ca14.tar.bz2 spack-ce772420dd32dfc9b1a170db39554eae9798ca14.tar.xz spack-ce772420dd32dfc9b1a170db39554eae9798ca14.zip | |
Relocate rpaths for all binaries, then do text bin replacement if the rpaths still exist after running patchelf/otool (#17418)
| -rw-r--r-- | lib/spack/spack/binary_distribution.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index ccfe614720..8658f7aa51 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -604,13 +604,9 @@ def relocate_package(spec, allow_root): # If we are installing back to the same location don't replace anything if old_layout_root != new_layout_root: - paths_to_relocate = [old_spack_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']))) + files_to_relocate = [os.path.join(workdir, filename) + for filename in buildinfo.get('relocate_binaries') + ] # If the buildcache was not created with relativized rpaths # do the relocation of path in binaries if (spec.architecture.platform == 'darwin' or @@ -646,6 +642,13 @@ def relocate_package(spec, allow_root): new_spack_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.relocate_text_bin(files_to_relocate, old_prefix, new_prefix, |