From d2a5a10f08961c4b70d834af380f632799383445 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Tue, 30 Apr 2019 04:07:29 -0400 Subject: vtk: Use the vendored libharu (#11293) VTK requires a patched libharu that is not maintained upstream See https://github.com/libharu/libharu/pull/157 --- var/spack/repos/builtin/packages/vtk/package.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index fcd2abc2ab..15f71e005d 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -34,10 +34,6 @@ class Vtk(CMakePackage): variant('ffmpeg', default=False, description='Build with FFMPEG support') variant('mpi', default=True, description='Enable MPI support') - # Haru causes trouble on Fedora and Ubuntu in v8.1.1 - # See https://bugzilla.redhat.com/show_bug.cgi?id=1460059#c13 - variant('haru', default=True, description='Enable libharu') - patch('gcc.patch', when='@6.1.0') # At the moment, we cannot build with both osmesa and qt, but as of @@ -68,8 +64,6 @@ class Vtk(CMakePackage): depends_on('mpi', when='+mpi') - depends_on('libharu', when='+haru') - depends_on('boost', when='+xdmf') depends_on('boost+mpi', when='+xdmf +mpi') @@ -109,15 +103,13 @@ class Vtk(CMakePackage): '-DBUILD_SHARED_LIBS=ON', '-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver), - '-DVTK_USE_SYSTEM_LIBHARU=%s' % ( - 'ON' if '+haru' in spec else 'OFF'), - # In general, we disable use of VTK "ThirdParty" libs, preferring # spack-built versions whenever possible '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON', # However, in a few cases we can't do without them yet '-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF', + '-DVTK_USE_SYSTEM_LIBHARU=OFF', '-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF', '-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF', -- cgit v1.2.3-70-g09d2