diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2017-06-02 09:58:21 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2017-06-02 09:59:02 -0500 |
| commit | f56f5ec0f8a43546c9590397c822365c07754628 (patch) | |
| tree | 16cf8536231bdb6e3bfcb81a96a3ab6f664d7f6a /sci-libs/vtk | |
| parent | app-text/calibre: version bump to 2.85.1 (diff) | |
| download | gentoo-f56f5ec0f8a43546c9590397c822365c07754628.tar.gz gentoo-f56f5ec0f8a43546c9590397c822365c07754628.tar.bz2 gentoo-f56f5ec0f8a43546c9590397c822365c07754628.zip | |
sci-libs/vtk: fix configure error with gcc 6/7, bug #596084
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'sci-libs/vtk')
| -rw-r--r-- | sci-libs/vtk/files/vtk-6.1.0-gcc67.patch | 26 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-6.1.0-r3.ebuild | 1 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-6.1.0-r4.ebuild | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch new file mode 100644 index 000000000000..83d1ae18f213 --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch @@ -0,0 +1,26 @@ +diff --git a/old/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake +index 05b2db9..92c2c4c 100644 +--- a/old/vtkCompilerExtras.cmake ++++ b/CMake/vtkCompilerExtras.cmake +@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) + +- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" ++ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" + _gcc_version "${_gcc_version_info}") + if(NOT _gcc_version) + string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" +diff --git a/old/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake +index 3cc12dd..b7a47df 100644 +--- a/old/GenerateExportHeader.cmake ++++ b/CMake/GenerateExportHeader.cmake +@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility) + execute_process(COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) +- string(REGEX MATCH "[345]\\.[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: diff --git a/sci-libs/vtk/vtk-6.1.0-r3.ebuild b/sci-libs/vtk/vtk-6.1.0-r3.ebuild index 7367f5ccbe6e..1345bde683ec 100644 --- a/sci-libs/vtk/vtk-6.1.0-r3.ebuild +++ b/sci-libs/vtk/vtk-6.1.0-r3.ebuild @@ -124,6 +124,7 @@ PATCHES=( "${FILESDIR}"/${P}-glext.patch "${FILESDIR}"/${P}-memset.patch "${FILESDIR}"/${P}-gdal2.patch + "${FILESDIR}"/${P}-gcc67.patch ) RESTRICT=test diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild index 9f22a8e67932..409b62823c89 100644 --- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild +++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild @@ -124,6 +124,7 @@ PATCHES=( "${FILESDIR}"/${P}-glext.patch "${FILESDIR}"/${P}-memset.patch "${FILESDIR}"/${P}-gdal2.patch + "${FILESDIR}"/${P}-gcc67.patch ) RESTRICT=test |