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

Account for bootstrapping from sources niche case

Browse Source 
This modification accounts for:
1. Bootstrapping from sources using system, non-standard Python
2. Using later an ABI compatible standard Python interpreter
This commit is contained in:
Massimiliano Culpo 2021-09-06 11:11:47 +02:00 committed by Todd Gamblin
parent fd0884c273
commit e47f0d486c
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/spack/spack/bootstrap.py
View File

@ -122,7 +122,8 @@ def _fix_ext_suffix(candidate_spec):
_suffix_to_be_checked = { _suffix_to_be_checked = {
'ppc64le': { 'ppc64le': {
'glob': '*.cpython-*-powerpc64le-linux-gnu.so', 'glob': '*.cpython-*-powerpc64le-linux-gnu.so',
're': r'.cpython-[\w]*-powerpc64le-linux-gnu.so' 're': r'.cpython-[\w]*-powerpc64le-linux-gnu.so',
'fmt': r'{module}.cpython-{major}{minor}m-powerpc64le-linux-gnu.so'
} }
} }
@ -143,16 +144,31 @@ def _fix_ext_suffix(candidate_spec):
# If we are here it means the current interpreter expects different names # If we are here it means the current interpreter expects different names
# than pristine CPython. So: # than pristine CPython. So:
# 1. Find what we have # 1. Find what we have installed
# 2. Compute what we want # 2. Create symbolic links for the other names, it they're not there already
# 3. Create symbolic links if they're not there already
extensions_on_disk = fs.find(candidate_spec.prefix, expected['glob']) # Check if standard names are installed and if we have to create
link_names = [re.sub(expected['re'], ext_suffix, s) for s in extensions_on_disk] # link for this interpreter
for file_name, link_name in zip(extensions_on_disk, link_names): standard_extensions = fs.find(candidate_spec.prefix, expected['glob'])
link_names = [re.sub(expected['re'], ext_suffix, s) for s in standard_extensions]
for file_name, link_name in zip(standard_extensions, link_names):
if os.path.exists(link_name): if os.path.exists(link_name):
continue continue
os.symlink(file_name, link_name) os.symlink(file_name, link_name)
# Check if this interpreter installed something and we have to create
# links for a standard CPython interpreter
non_standard_extensions = fs.find(candidate_spec.prefix, '*' + ext_suffix)
for abs_path in non_standard_extensions:
directory, filename = os.path.split(abs_path)
module = filename.split('.')[0]
link_name = os.path.join(directory, expected['fmt'].format(
module=module, major=sys.version_info[0], minor=sys.version_info[1])
)
if os.path.exists(link_name):
continue
os.symlink(abs_path, link_name)
@_bootstrapper(type='buildcache') @_bootstrapper(type='buildcache')
class _BuildcacheBootstrapper(object): class _BuildcacheBootstrapper(object):