diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-12 23:43:39 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-05-31 14:54:06 -0400 |
| commit | 607e48ba3ccb038e2fa4b956cb62ce628cdc8cd0 (patch) | |
| tree | 6b802b21618ced9de8bc94bf7cc9f713879d2072 /gnu/packages/patches/vtk-7-gcc-10-compat.patch | |
| parent | 17375266ea2e94726bf3d28c1d4fb3899c115377 (diff) | |
| download | guix-607e48ba3ccb038e2fa4b956cb62ce628cdc8cd0.tar.gz guix-607e48ba3ccb038e2fa4b956cb62ce628cdc8cd0.zip | |
gnu: Add vtk-7.
* gnu/packages/image-processing.scm: (vtk-7): New variable.
* gnu/packages/patches/vtk-7-gcc-10-compat.patch: New patch.
* gnu/packages/patches/vtk-7-hdf5-compat.patch: Likewise.
* gnu/packages/patches/vtk-7-python-compat.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
Diffstat (limited to 'gnu/packages/patches/vtk-7-gcc-10-compat.patch')
| -rw-r--r-- | gnu/packages/patches/vtk-7-gcc-10-compat.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/vtk-7-gcc-10-compat.patch b/gnu/packages/patches/vtk-7-gcc-10-compat.patch new file mode 100644 index 0000000000..50f9f6cca3 --- /dev/null +++ b/gnu/packages/patches/vtk-7-gcc-10-compat.patch @@ -0,0 +1,14 @@ +Retrieved from +https://sources.debian.org/src/vtk7/7.1.1%2Bdfsg2-10.1/debian/patches/. + +--- a/CMake/VTKGenerateExportHeader.cmake ++++ b/CMake/VTKGenerateExportHeader.cmake +@@ -174,7 +174,7 @@ + execute_process(COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) +- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" ++ string(REGEX MATCH "[0-9]*\\.[0-9]\\.[0-9]*" + _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the + # patch level, handle this here: |