Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ROOT recipe updates #175

Merged
merged 3 commits into from
Sep 12, 2023
Merged

ROOT recipe updates #175

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e179cb9
[root] Backport changes from upstream/develop
greenc-FNAL Sep 8, 2023
beb7092
[root] Account for deprecated `cxxmodules` feature
greenc-FNAL Sep 8, 2023
b6e3e81
[root] webgui feature requires http
greenc-FNAL Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions var/spack/repos/builtin/packages/root/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Root(CMakePackage):
# Development version (when more recent than production).

# Production version
version("6.28.06", sha256="af3b673b9aca393a5c9ae1bf86eab2672aaf1841b658c5c6e7a30ab93c586533")
version("6.28.04", sha256="70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965")
version("6.28.02", sha256="6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa")
version("6.28.00", sha256="afa1c5c06d0915411cb9492e474ea9ab12b09961a358e7e559013ed63b5d8084")
Expand Down Expand Up @@ -157,7 +158,7 @@ class Root(CMakePackage):
default=False,
description="Enable support for TMultilayerPerceptron " "classes' federation",
)
variant("mysql", default=False)
variant("mysql", default=False, description="Enable support for MySQL databases")
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")
Expand Down Expand Up @@ -280,11 +281,13 @@ class Root(CMakePackage):
depends_on("sqlite", when="+sqlite")
depends_on("tbb", when="+tbb")
# See: https://github.com/root-project/root/issues/6933
conflicts("^intel-tbb@2021.1:", when="@:6.22", msg="Please use an older intel-tbb version")
conflicts(
"^intel-tbb@2021.1:", when="@:6.22", msg="Please use an older intel-tbb version for ROOT"
)
conflicts(
"^intel-oneapi-tbb@2021.1:",
when="@:6.22",
msg="Please use an older intel-tbb/intel-oneapi-tbb version",
msg="Please use an older intel-tbb/intel-oneapi-tbb version for ROOT",
)
# depends_on('intel-tbb@:2021.0', when='@:6.22 ^intel-tbb')
depends_on("unuran", when="+unuran")
Expand Down Expand Up @@ -314,20 +317,23 @@ class Root(CMakePackage):

# Incompatible variants
if sys.platform != "darwin":
conflicts("+opengl", when="~x", msg="OpenGL requires X")
conflicts("+math", when="~gsl", msg="Math requires GSL")
conflicts("+tmva", when="~gsl", msg="TVMA requires GSL")
conflicts("+tmva", when="~mlp", msg="TVMA requires MLP")
conflicts("+opengl", when="~x", msg="root+opengl requires X")
conflicts("+math", when="~gsl", msg="root+math requires GSL")
conflicts("+tmva", when="~gsl", msg="root+tmva requires GSL")
conflicts("+tmva", when="~mlp", msg="root+tmva requires MLP")
conflicts("~http", when="@6.29.00: +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=20", when="@:6.28.02", msg="C++20 support requires at least version 6.28.04")
conflicts(
"cxxstd=20", when="@:6.28.02", msg="C++20 support requires root version at least 6.28.04"
)

# See https://github.com/root-project/root/issues/11128
conflicts("%clang@16:", when="@:6.26.07", msg="clang 16+ support was added in 6.26.08")
conflicts("%clang@16:", when="@:6.26.07", msg="clang 16+ support was added in root 6.26.08")

# See https://github.com/root-project/root/issues/11714
if sys.platform == "darwin" and macos_version() >= Version("13"):
conflicts("@:6.26.09", msg="macOS 13 support was added in 6.26.10")
conflicts("@:6.26.09", msg="macOS 13 support was added in root 6.26.10")

# ROOT <6.14 is incompatible with Python >=3.7, which is the minimum supported by spack
conflicts("+python", when="@:6.13", msg="Spack wants python >=3.7, too new for ROOT <6.14")
Expand Down Expand Up @@ -411,8 +417,11 @@ def _add_variant(variants, features, featurename, variantname):
_add_variant(v, f, ("qt", "qtgsi"), "+qt4")
_add_variant(v, f, "r", "+r")
_add_variant(v, f, "roofit", "+roofit")
_add_variant(v, f, ("root7", "webgui"), "+webgui") # for root version >= 6.18.00
_add_variant(v, f, ("root7", "webui"), "+webgui") # for root version <= 6.17.02
# webui feature renamed to webgui in 6.18
if Version(version_str).satisfies("@6.18:"):
_add_variant(v, f, ("root7", "webgui"), "+webgui")
else:
_add_variant(v, f, ("root7", "webui"), "+webgui")
_add_variant(v, f, "rpath", "+rpath")
_add_variant(v, f, "shadowpw", "+shadow")
_add_variant(v, f, "spectrum", "+spectrum")
Expand Down Expand Up @@ -442,7 +451,6 @@ def cmake_args(self):

# Options controlling gross build / config behavior.
options += [
define("cxxmodules", False),
define("exceptions", True),
define("explicitlink", True),
define("fail-on-missing", True),
Expand All @@ -463,6 +471,9 @@ def cmake_args(self):
define("CLING_CXX_PATH", self.compiler.cxx),
]

if self.spec.satisfies("@:6.28.99"):
options.append(define("cxxmodules", False))

# Options related to ROOT's ability to download and build its own
# dependencies. Per Spack convention, this should generally be avoided.

Expand Down