summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Christian Tacke <58549698+ChristianTackeGSI@users.noreply.github.com>2021-03-19 00:19:08 +0100
committerGitHub <noreply@github.com>2021-03-18 17:19:08 -0600
commitd07cb59bef98f26ed0d2da332301e5277dd8b4d9 (patch)
tree20811450bf80d77ef7e7cc74129fbbd41bd414d8
parent02c3b23a154e8a6eda39b598daf3b7b3dc527e2b (diff)
downloadspack-d07cb59bef98f26ed0d2da332301e5277dd8b4d9.tar.gz
spack-d07cb59bef98f26ed0d2da332301e5277dd8b4d9.tar.bz2
spack-d07cb59bef98f26ed0d2da332301e5277dd8b4d9.tar.xz
spack-d07cb59bef98f26ed0d2da332301e5277dd8b4d9.zip
root/intel-tbb interaction (#22366)
root 6.22 does not work with intel-tbb 2021.1.1. So: * Introduce conflicts() (a fitting depends_on in the comments, but does not help with the classic conretizer.) * Mark 2020.3 as preferred to help concretizer, when newer versions come up. * Previous discussion: https://github.com/spack/spack/pull/22263#issuecomment-797606475 * Relevant ROOT issue: https://github.com/root-project/root/issues/6933
-rw-r--r--var/spack/repos/builtin/packages/intel-tbb/package.py3
-rw-r--r--var/spack/repos/builtin/packages/root/package.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py
index 8004293368..8ef66abafa 100644
--- a/var/spack/repos/builtin/packages/intel-tbb/package.py
+++ b/var/spack/repos/builtin/packages/intel-tbb/package.py
@@ -23,7 +23,8 @@ class IntelTbb(Package):
# Note: when adding new versions, please check and update the
# patches, filters and url_for_version() below as needed.
- version('2020.3', sha256='ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3')
+ version('2020.3', sha256='ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3',
+ preferred=True)
version('2020.2', sha256='4804320e1e6cbe3a5421997b52199e3c1a3829b2ecb6489641da4b8e32faf500')
version('2020.1', sha256='7c96a150ed22bc3c6628bc3fef9ed475c00887b26d37bca61518d76a56510971')
version('2020.0', sha256='57714f2d2cf33935db33cee93af57eb3ecd5a7bef40c1fb7ca4a41d79684b118')
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py
index 4334e9b2b4..c72571c69b 100644
--- a/var/spack/repos/builtin/packages/root/package.py
+++ b/var/spack/repos/builtin/packages/root/package.py
@@ -248,6 +248,10 @@ class Root(CMakePackage):
depends_on('shadow', when='+shadow')
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')
+ # depends_on('intel-tbb@:2021.0', when='@:6.22 ^intel-tbb')
depends_on('unuran', when='+unuran')
depends_on('vc', when='+vc')
depends_on('vdt', when='+vdt')