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

Fixes to allow Boost to build with Python 3 (#3293)

Browse Source 
* Fixes to allow Boost to build with Python 3

* Restrict patch to Python 3 only
This commit is contained in:
Adam J. Stewart
2017-03-02 18:36:10 -06:00
committed by GitHub
parent bde0a67415
commit 7fcd414050
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/boost/package.py
View File

@@ -130,6 +130,9 @@ class Boost(Package):
# Patch fix from https://svn.boost.org/trac/boost/ticket/11856
patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7')
# Patch fix from https://svn.boost.org/trac/boost/ticket/11120
patch('python_jam.patch', when='^python@3:')
# Patch fix from https://svn.boost.org/trac/boost/ticket/10125
patch('boost_10125.patch', when='@1.55.0%gcc@5.0:5.9')
@@ -153,7 +156,7 @@ def determine_toolset(self, spec):
toolsets = {'g++': 'gcc',
'icpc': 'intel',
'clang++': 'clang',
'clang++': 'clang',
'xlc++': 'xlcpp',
'xlc++_r': 'xlcpp'}
@@ -192,8 +195,7 @@ def determine_bootstrap_options(self, spec, withLibs, options):
options.append("--with-libraries=%s" % ','.join(withLibs))
if '+python' in spec:
options.append('--with-python=%s' %
join_path(spec['python'].prefix.bin, 'python'))
options.append('--with-python=%s' % python_exe)
with open('user-config.jam', 'w') as f:
# Boost may end up using gcc even though clang+gfortran is set in