Skip to content

Commit

Permalink
root: remove +webgui~http conflict version clause (spack#45856)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
stephenswat authored Aug 22, 2024
1 parent ba56622 commit 8e1bd9a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/root/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 8e1bd9a

Please sign in to comment.