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

Fix buildcache relocate: only skip if rpaths are relative (#7605)

Browse source 
This fixes a check that decides when to skip buildcache relocation.
Originally the check was flawed in two ways: it would skip if the
source prefix matched the destination prefix, which no longer
matters since the source prefix is replaced with a placeholder
(so it always needs to be updated); it also would skip relocation
if the rpaths were not relative, when in fact it should be the
opposite (binaries without relative rpaths *should* be relocated,
and those without don't need it).
This commit is contained in:
Patrick Gartung 2018-03-27 12:54:26 -05:00 committed by scheibelp
parent 0d07be278a
commit 52d55ea317
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/binary_distribution.py
View file

@ -415,7 +415,7 @@ def relocate_package(workdir, allow_root):
new_path = spack.store.layout.root new_path = spack.store.layout.root
old_path = buildinfo['buildpath'] old_path = buildinfo['buildpath']
rel = buildinfo.get('relative_rpaths', False) rel = buildinfo.get('relative_rpaths', False)
if new_path == old_path and not rel: if rel:
return return
tty.msg("Relocating package from", tty.msg("Relocating package from",