From 7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0 Mon Sep 17 00:00:00 2001 From: "Dr. Christian Tacke" <58549698+ChristianTackeGSI@users.noreply.github.com> Date: Thu, 8 Apr 2021 10:38:46 +0200 Subject: root: add conflict with intel-oneapi-tbb (#22850) As originally noted, ROOT 6.22 does not work with intel's TBB >= 2021.1. So we need to also conflict with the newer package (intel-oneapi-tbb) --- var/spack/repos/builtin/packages/root/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index c72571c69b..78d0d59edb 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -251,6 +251,8 @@ class Root(CMakePackage): # 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-oneapi-tbb@2021.1:', when='@:6.22', + msg='Please use an older intel-tbb/intel-oneapi-tbb version') # depends_on('intel-tbb@:2021.0', when='@:6.22 ^intel-tbb') depends_on('unuran', when='+unuran') depends_on('vc', when='+vc') -- cgit v1.2.3-60-g2f50