summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatish Balay <balay@mcs.anl.gov>2022-08-15 13:35:00 -0500
committerGitHub <noreply@github.com>2022-08-15 11:35:00 -0700
commitede6d2caac85d2433cd1c58fdff681a105f8dcc0 (patch)
tree0af72f2c806247186906f1a17606c268b1b4f027
parent43c0dac6f6716b78fc61f7737fa796b7f057e90b (diff)
downloadspack-ede6d2caac85d2433cd1c58fdff681a105f8dcc0.tar.gz
spack-ede6d2caac85d2433cd1c58fdff681a105f8dcc0.tar.bz2
spack-ede6d2caac85d2433cd1c58fdff681a105f8dcc0.tar.xz
spack-ede6d2caac85d2433cd1c58fdff681a105f8dcc0.zip
fix oce build failure due to change of intel-tbb default version (#32101)
In file included from /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.cxx:17: /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx: In static member function 'static void OSD_Parallel::ForEach(InputIterator, InputIterator, const Functor&, Standard_Boolean)': /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx:223:18: error: 'captured_exception' in namespace 'tbb' does not name a type 223 | catch ( tbb::captured_exception& anException ) | ^~~~~~~~~~~~~~~~~~ /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx:225:38: error: 'anException' was not declared in this scope 225 | Standard_NotImplemented::Raise(anException.what()); | ^~~~~~~~~~~ /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx: In static member function 'static void OSD_Parallel::For(Standard_Integer, Standard_Integer, const Functor&, Standard_Boolean)': /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx:272:18: error: 'captured_exception' in namespace 'tbb' does not name a type 272 | catch ( tbb::captured_exception& anException ) | ^~~~~~~~~~~~~~~~~~ /data/xsdkci/VS1mJQ1K/0/xsdk-project/spack-xsdk/spack-stage/balay/spack-stage-oce-0.18.3-rim5zhuacb7z4plxag52fjj3gbc4znv3/spack-src/src/OSD/OSD_Parallel.hxx:274:38: error: 'anException' was not declared in this scope 274 | Standard_NotImplemented::Raise(anException.what()); | ^~~~~~~~~~~
-rw-r--r--var/spack/repos/builtin/packages/oce/package.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py
index 4b0e19b9ad..aece04bd2e 100644
--- a/var/spack/repos/builtin/packages/oce/package.py
+++ b/var/spack/repos/builtin/packages/oce/package.py
@@ -33,6 +33,8 @@ class Oce(Package):
depends_on("cmake@2.8:", type="build")
depends_on("tbb", when="+tbb")
+ conflicts("intel-tbb@2021.1:")
+ conflicts("intel-oneapi-tbb@2021.1:")
# There is a bug in OCE which appears with Clang (version?) or GCC 6.0
# and has to do with compiler optimization, see