summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Christian Tacke <58549698+ChristianTackeGSI@users.noreply.github.com>2021-04-08 10:38:46 +0200
committerGitHub <noreply@github.com>2021-04-08 10:38:46 +0200
commit7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0 (patch)
treea4fbfc09da6bf1a1fe07093371d86d929874dd82
parent43bdbc8234f7a9b6a16247f82c0dee9c4c031e15 (diff)
downloadspack-7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0.tar.gz
spack-7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0.tar.bz2
spack-7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0.tar.xz
spack-7e17fb1ae1d8fa5f6e8653a790e95fc9057a2df0.zip
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)
-rw-r--r--var/spack/repos/builtin/packages/root/package.py2
1 files changed, 2 insertions, 0 deletions
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')