diff options
| author | iarspider <iarspider@gmail.com> | 2021-05-14 21:08:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 21:08:35 +0200 |
| commit | fc392d2f56beae448dd5d8888dbb2b8cde6d9e64 (patch) | |
| tree | 65a999ccfeeeeec8057ed356dc06a4c625764a65 | |
| parent | 59a520246bf6cc0ad7dc70d26fb340b3a7a404bb (diff) | |
| download | spack-fc392d2f56beae448dd5d8888dbb2b8cde6d9e64.tar.gz spack-fc392d2f56beae448dd5d8888dbb2b8cde6d9e64.tar.bz2 spack-fc392d2f56beae448dd5d8888dbb2b8cde6d9e64.tar.xz spack-fc392d2f56beae448dd5d8888dbb2b8cde6d9e64.zip | |
root: Add variants: dcache and oracle (#23441)
| -rw-r--r-- | var/spack/repos/builtin/packages/root/README.md | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/root/README.md b/var/spack/repos/builtin/packages/root/README.md index 5f9180dc95..d0e7674484 100644 --- a/var/spack/repos/builtin/packages/root/README.md +++ b/var/spack/repos/builtin/packages/root/README.md @@ -12,10 +12,6 @@ The following configuration options are unsupported (set to `OFF`) due to missin Requires `libgapiUI` from ALICE. -#### `dcache` - -DCache support depends on `libdcap` from DESY. - #### `gfal` #### `http` @@ -28,12 +24,8 @@ Monitoring with Monalisa depends on `libapmoncpp`. #### `odbc` -#### `oracle` - #### `tcmalloc` -#### `veccore` - #### `xinetd` ### Discontinued options diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index de63c15eb2..c23f66432e 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -92,6 +92,8 @@ class Root(CMakePackage): description='Enable Aqua interface') variant('davix', default=True, description='Compile with external Davix') + variant('dcache', default=False, + description='Enable support for dCache') variant('emacs', default=False, description='Enable Emacs support') variant('examples', default=True, @@ -129,6 +131,8 @@ class Root(CMakePackage): variant('mysql', default=False) variant('opengl', default=True, description='Enable OpenGL support') + variant('oracle', default=False, + description='Enable support for Oracle databases') variant('postgres', default=False, description='Enable postgres support') variant('pythia6', default=False, @@ -236,6 +240,7 @@ class Root(CMakePackage): # Optional dependencies depends_on('davix @0.7.1:', when='+davix') + depends_on('dcap', when='+dcache') depends_on('cfitsio', when='+fits') depends_on('fftw', when='+fftw') depends_on('graphviz', when='+graphviz') @@ -244,6 +249,7 @@ class Root(CMakePackage): depends_on('mysql-client', when='+mysql') depends_on('openssl', when='+ssl') depends_on('openssl', when='+davix') # Also with davix + depends_on('oracle-instant-client@19.10.0.0.0', when='+oracle @:6.24.01') depends_on('postgresql', when='+postgres') depends_on('pythia6+root', when='+pythia6') depends_on('pythia8', when='+pythia8') @@ -391,7 +397,7 @@ class Root(CMakePackage): define_from_variant('cocoa', 'aqua'), define('dataframe', True), define_from_variant('davix'), - define('dcache', False), + define_from_variant('dcache'), define_from_variant('fftw3', 'fftw'), define_from_variant('fitsio', 'fits'), define_from_variant('ftgl', 'opengl'), @@ -420,7 +426,7 @@ class Root(CMakePackage): define_from_variant('mysql'), define('odbc', False), define_from_variant('opengl'), - define('oracle', False), + define_from_variant('oracle'), define_from_variant('pgsql', 'postgres'), define_from_variant('pythia6'), define_from_variant('pythia8'), |