From 2beefc6bfebe41561cf7fd769d6d06716f070936 Mon Sep 17 00:00:00 2001 From: Stephen McDowell Date: Mon, 9 Mar 2020 04:35:31 -0400 Subject: eigen variants have been removed (#15392) * eigen variants have been removed ref: https://github.com/spack/spack/pull/15357 * opencv ^eigen is ('build', 'run') dependency --- var/spack/repos/builtin/packages/libmesh/package.py | 5 +---- var/spack/repos/builtin/packages/opencv/package.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 541e98a0d4..a828b3c87a 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -79,10 +79,7 @@ class Libmesh(AutotoolsPackage): 'variant.') depends_on('boost', when='+boost') - # The Scotch dependency of Eigen is not used by libMesh. Since Scotch can - # only be used with certain versions of flex it conflicts with several - # versions of GCC, so explicitly disable it. - depends_on('eigen~scotch', when='+eigen') + depends_on('eigen', when='+eigen') depends_on('hdf5+mpi', when='+hdf5+mpi') depends_on('mpi', when='+mpi') depends_on('mpi', when='+slepc') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 95abf6368a..7adacd1eef 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -105,8 +105,7 @@ class Opencv(CMakePackage, CudaPackage): # the current development branch of OpenCV. See #8461 for more information. patch('dnn_cuda.patch', when='@3.3.0:3.4.1+cuda+dnn') - depends_on('eigen~mpfr', when='+eigen', type='build') - + depends_on('eigen', when='+eigen') depends_on('zlib', when='+zlib') depends_on('libpng', when='+png') depends_on('jpeg', when='+jpeg') -- cgit v1.2.3-60-g2f50