diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/root/README.md | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/root/README.md b/var/spack/repos/builtin/packages/root/README.md index d808498b34..5f9180dc95 100644 --- a/var/spack/repos/builtin/packages/root/README.md +++ b/var/spack/repos/builtin/packages/root/README.md @@ -30,8 +30,6 @@ Monitoring with Monalisa depends on `libapmoncpp`. #### `oracle` -#### `pythia8` - #### `tcmalloc` #### `veccore` diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index a3c9202833..598fd78dd9 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -117,6 +117,8 @@ class Root(CMakePackage): description='Enable postgres support') variant('pythia6', default=False, description='Enable pythia6 support') + variant('pythia8', default=False, + description='Enable pythia8 support') variant('python', default=True, description='Enable Python ROOT bindings') variant('qt4', default=False, @@ -216,6 +218,7 @@ class Root(CMakePackage): depends_on('openssl', when='+davix') # Also with davix depends_on('postgresql', when='+postgres') depends_on('pythia6+root', when='+pythia6') + depends_on('pythia8', when='+pythia8') depends_on('python@2.7:', when='+python', type=('build', 'run')) depends_on('r', when='+r', type=('build', 'run')) depends_on('r-rcpp', when='+r', type=('build', 'run')) @@ -361,8 +364,8 @@ class Root(CMakePackage): ['oracle', False], ['pgsql', 'postgres'], ['pythia6'], - ['pythia8', False], - ['python', self.spec.satisfies('+python')], + ['pythia8'], + ['python'], ['qt', 'qt4'], # See conflicts ['qtgsi', 'qt4'], # See conflicts ['r', 'R'], |