From 517212b8a32a172454e8dc062c32592c3c17f93e Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sun, 19 May 2019 05:56:56 +0200 Subject: Add conflicts in deal.II package between SymEngine and Trilinos variants (#11499) --- var/spack/repos/builtin/packages/dealii/package.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 08af577018..1c72fbc7a8 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -157,6 +157,13 @@ class Dealii(CMakePackage, CudaPackage): depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi~int64+cuda') depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi+int64+cuda') + # Both Trilinos and SymEngine bundle the Teuchos RCP library. + # This leads to conflicts between macros defined in the included + # headers when they are not compiled in the same mode. + # See https://github.com/symengine/symengine/issues/1516 + depends_on("symengine build_type=Release", when="^symengine ^trilinos~debug") + depends_on("symengine build_type=Debug", when="^symengine ^trilinos+debug") + # Explicitly provide a destructor in BlockVector, # otherwise deal.II may fail to build with Intel compilers. patch('https://github.com/dealii/dealii/commit/a89d90f9993ee9ad39e492af466b3595c06c3e25.patch', -- cgit v1.2.3-60-g2f50