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

updated config file name for Python 3.6 (#2881)

Browse Source
This commit is contained in:
Gregory Lee
2017-01-23 09:34:50 -08:00
committed by Todd Gamblin
parent 19699a7607
commit 6bc7be9217
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,16 @@ def install(self, spec, prefix):
make() make()
make('install') make('install')
self.sysconfigfilename = '_sysconfigdata.py'
if spec.satisfies('@3.6:'):
# Python 3.6.0 renamed the sys config file
python3 = os.path.join(prefix.bin,
'python{0}'.format(self.version.up_to(1)))
python = Executable(python3)
sc = 'import sysconfig; print(sysconfig._get_sysconfigdata_name())'
cf = python('-c', sc, output=str).strip('\n')
self.sysconfigfilename = '{0}.py'.format(cf)
self._save_distutil_vars(prefix) self._save_distutil_vars(prefix)
self.filter_compilers(prefix) self.filter_compilers(prefix)
@@ -207,12 +217,11 @@ def _save_distutil_vars(self, prefix):
input_filename = None input_filename = None
for filename in [join_path(lib_dir, for filename in [join_path(lib_dir,
'python{0}'.format(self.version.up_to(2)), 'python{0}'.format(self.version.up_to(2)),
'_sysconfigdata.py') self.sysconfigfilename)
for lib_dir in [prefix.lib, prefix.lib64]]: for lib_dir in [prefix.lib, prefix.lib64]]:
if os.path.isfile(filename): if os.path.isfile(filename):
input_filename = filename input_filename = filename
break break
if not input_filename: if not input_filename:
return return
@@ -301,7 +310,7 @@ def filter_compilers(self, prefix):
config_dirname = 'config-{0}m'.format( config_dirname = 'config-{0}m'.format(
self.version.up_to(2)) if self.spec.satisfies('@3:') else 'config' self.version.up_to(2)) if self.spec.satisfies('@3:') else 'config'
rel_filenames = ['_sysconfigdata.py', rel_filenames = [self.sysconfigfilename,
join_path(config_dirname, 'Makefile')] join_path(config_dirname, 'Makefile')]
abs_filenames = [join_path(dirname, filename) for dirname in abs_filenames = [join_path(dirname, filename) for dirname in