diff options
| author | Olivier Cessenat <cessenat@gmail.com> | 2022-05-04 20:12:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 11:12:49 -0700 |
| commit | 0d3d1ea7d0c66a63d8f00336ea7eefdb1de7f588 (patch) | |
| tree | a06c0d3021f6dfdfcee5fc215654253f362fb45c | |
| parent | 39c4a66e5bda365483ae99e26e04b79d69eda791 (diff) | |
| download | spack-0d3d1ea7d0c66a63d8f00336ea7eefdb1de7f588.tar.gz spack-0d3d1ea7d0c66a63d8f00336ea7eefdb1de7f588.tar.bz2 spack-0d3d1ea7d0c66a63d8f00336ea7eefdb1de7f588.tar.xz spack-0d3d1ea7d0c66a63d8f00336ea7eefdb1de7f588.zip | |
gxsview: vtk9 no longer builds libvtkjpeg... (#30340)
| -rw-r--r-- | var/spack/repos/builtin/packages/gxsview/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gxsview/vtk9.patch | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gxsview/package.py b/var/spack/repos/builtin/packages/gxsview/package.py index 63fade8088..67f1ce44f9 100644 --- a/var/spack/repos/builtin/packages/gxsview/package.py +++ b/var/spack/repos/builtin/packages/gxsview/package.py @@ -27,6 +27,8 @@ class Gxsview(QMakePackage): depends_on('vtk@8.0:+qt+opengl2') # +mpi+python are optional conflicts('%gcc@:7.2.0', msg='Requires C++17 compiler support') # need C++17 standard + patch('vtk9.patch', when='^vtk@9:') + build_directory = 'gui' def qmake_args(self): diff --git a/var/spack/repos/builtin/packages/gxsview/vtk9.patch b/var/spack/repos/builtin/packages/gxsview/vtk9.patch new file mode 100644 index 0000000000..1ebbca181b --- /dev/null +++ b/var/spack/repos/builtin/packages/gxsview/vtk9.patch @@ -0,0 +1,26 @@ +diff --git a/gui/vtk9.pri b/gui/vtk9.pri +index 15fdd91..ca452e0 100644 +--- a/gui/vtk9.pri ++++ b/gui/vtk9.pri +@@ -60,21 +60,8 @@ LIBS += \ + -lvtkRenderingUI$$VTK_VER_SUFFIX \ + -lvtkRenderingVolume$$VTK_VER_SUFFIX \ + -lvtkRenderingVtkJS$$VTK_VER_SUFFIX \ +- -lvtkdoubleconversion$$VTK_VER_SUFFIX \ +- -lvtkexpat$$VTK_VER_SUFFIX \ +- -lvtkfreetype$$VTK_VER_SUFFIX \ +- -lvtkglew$$VTK_VER_SUFFIX \ +- -lvtkgl2ps$$VTK_VER_SUFFIX \ +- -lvtkjpeg$$VTK_VER_SUFFIX \ +- -lvtkjsoncpp$$VTK_VER_SUFFIX \ + -lvtkloguru$$VTK_VER_SUFFIX \ +- -lvtklz4$$VTK_VER_SUFFIX \ +- -lvtklzma$$VTK_VER_SUFFIX \ + -lvtkmetaio$$VTK_VER_SUFFIX \ +- -lvtkpng$$VTK_VER_SUFFIX \ +- -lvtkpugixml$$VTK_VER_SUFFIX \ + -lvtksys$$VTK_VER_SUFFIX \ +- -lvtktiff$$VTK_VER_SUFFIX \ +- -lvtkzlib$$VTK_VER_SUFFIX \ + -lvtkViewsContext2D$$VTK_VER_SUFFIX \ + -lvtkViewsCore$$VTK_VER_SUFFIX \ |