diff options
| author | Stephen Nicholas Swatman <stephen@v25.nl> | 2024-08-22 15:14:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-22 08:14:09 -0500 |
| commit | 8e1bd9a40375196972a03530c01be1302693cb2b (patch) | |
| tree | 7cdb695ff5aecd8435e44f15f9af0d41c1069677 | |
| parent | ba566225741081bc26c7cf6c6c652ac0de6e6471 (diff) | |
| download | spack-8e1bd9a40375196972a03530c01be1302693cb2b.tar.gz spack-8e1bd9a40375196972a03530c01be1302693cb2b.tar.bz2 spack-8e1bd9a40375196972a03530c01be1302693cb2b.tar.xz spack-8e1bd9a40375196972a03530c01be1302693cb2b.zip | |
root: remove +webgui~http conflict version clause (#45856)
* root: set +webgui~http conflict from @6.28.12:
Currently, the ROOT spec correctly identifies a conflict between +webgui
and ~http, but this conflict is marked as affecting @6.29.00: only. As a
matter of fact, ROOT 6.28.12 is also affected. This commit, therefore,
updates the when clause on the conflict to @6.28.12:.
* Remove when clause entirely
* oops
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index aec5af2737..096aa269bb 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -423,7 +423,7 @@ class Root(CMakePackage): conflicts("+tmva-gpu", when="~cuda", msg="root+tmva-gpu requires CUDA") conflicts("+tmva-pymva", when="~tmva", msg="root+tmva-pymva requires TMVA") conflicts("+tmva-sofie", when="~tmva", msg="root+tmva-sofie requires TMVA") - conflicts("~http", when="@6.29.00: +webgui", msg="root+webgui requires HTTP") + conflicts("~http", when="+webgui", msg="root+webgui requires HTTP") conflicts("cxxstd=11", when="+root7", msg="root7 requires at least C++14") conflicts("cxxstd=11", when="@6.25.02:", msg="This version of root requires at least C++14") conflicts("cxxstd=14", when="@6.30.00:", msg="This version of root requires at least C++17") |