zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eigen variants have been removed (#15392)

Browse Source 
* eigen variants have been removed

ref: https://github.com/spack/spack/pull/15357

* opencv ^eigen is ('build', 'run') dependency
This commit is contained in:
Stephen McDowell 2020-03-09 04:35:31 -04:00 committed by GitHub
parent 49ec260a9a
commit 2beefc6bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/libmesh/package.py
View File

@ -79,10 +79,7 @@ class Libmesh(AutotoolsPackage):
'variant.') 'variant.')
depends_on('boost', when='+boost') depends_on('boost', when='+boost')
# The Scotch dependency of Eigen is not used by libMesh. Since Scotch can depends_on('eigen', when='+eigen')
# 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('hdf5+mpi', when='+hdf5+mpi') depends_on('hdf5+mpi', when='+hdf5+mpi')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('mpi', when='+slepc') depends_on('mpi', when='+slepc')

3
var/spack/repos/builtin/packages/opencv/package.py
View File

@ -105,8 +105,7 @@ class Opencv(CMakePackage, CudaPackage):
# the current development branch of OpenCV. See #8461 for more information. # the current development branch of OpenCV. See #8461 for more information.
patch('dnn_cuda.patch', when='@3.3.0:3.4.1+cuda+dnn') 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('zlib', when='+zlib')
depends_on('libpng', when='+png') depends_on('libpng', when='+png')
depends_on('jpeg', when='+jpeg') depends_on('jpeg', when='+jpeg')