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

root: Configure ROOT correctly for python3 (#14225)

Browse Source 
* Configure ROOT correctly for python3

* Record Python version conflict

* Code editing on a phone sucks
This commit is contained in:
Hadrien G 2020-01-09 16:33:10 +01:00 committed by Adam J. Stewart
parent ff23672591
commit b982015930
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/root/package.py
View File

@ -241,6 +241,9 @@ class Root(CMakePackage):
# GCC 9.2.1, which we can safely extrapolate to the GCC 9 series. # GCC 9.2.1, which we can safely extrapolate to the GCC 9 series.
conflicts('%gcc@9.0.0:', when='@:6.11.99') conflicts('%gcc@9.0.0:', when='@:6.11.99')
# ROOT <6.14 was incompatible with Python 3.7+
conflicts('python@3.7:', when='@:6.13.99 +python')
# See README.md # See README.md
conflicts('+http', conflicts('+http',
msg='HTTP server currently unsupported due to dependency issues') msg='HTTP server currently unsupported due to dependency issues')
@ -358,8 +361,7 @@ def cmake_args(self):
['pgsql', 'postgres'], ['pgsql', 'postgres'],
['pythia6'], ['pythia6'],
['pythia8', False], ['pythia8', False],
['python', self.spec.satisfies('+python ^python@2.7:2.99.99')], ['python', self.spec.satisfies('+python')],
['python3', self.spec.satisfies('+python ^python@3.0:')],
['qt', 'qt4'], # See conflicts ['qt', 'qt4'], # See conflicts
['qtgsi', 'qt4'], # See conflicts ['qtgsi', 'qt4'], # See conflicts
['r', 'R'], ['r', 'R'],