| 1 |
commit: f56f5ec0f8a43546c9590397c822365c07754628 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 2 14:58:21 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 2 14:59:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56f5ec0 |
| 7 |
|
| 8 |
sci-libs/vtk: fix configure error with gcc 6/7, bug #596084 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
sci-libs/vtk/files/vtk-6.1.0-gcc67.patch | 26 ++++++++++++++++++++++++++ |
| 13 |
sci-libs/vtk/vtk-6.1.0-r3.ebuild | 1 + |
| 14 |
sci-libs/vtk/vtk-6.1.0-r4.ebuild | 1 + |
| 15 |
3 files changed, 28 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..83d1ae18f21 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch |
| 22 |
@@ -0,0 +1,26 @@ |
| 23 |
+diff --git a/old/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake |
| 24 |
+index 05b2db9..92c2c4c 100644 |
| 25 |
+--- a/old/vtkCompilerExtras.cmake |
| 26 |
++++ b/CMake/vtkCompilerExtras.cmake |
| 27 |
+@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
| 28 |
+ OUTPUT_VARIABLE _gcc_version_info |
| 29 |
+ ERROR_VARIABLE _gcc_version_info) |
| 30 |
+ |
| 31 |
+- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" |
| 32 |
++ string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" |
| 33 |
+ _gcc_version "${_gcc_version_info}") |
| 34 |
+ if(NOT _gcc_version) |
| 35 |
+ string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" |
| 36 |
+diff --git a/old/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake |
| 37 |
+index 3cc12dd..b7a47df 100644 |
| 38 |
+--- a/old/GenerateExportHeader.cmake |
| 39 |
++++ b/CMake/GenerateExportHeader.cmake |
| 40 |
+@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility) |
| 41 |
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version |
| 42 |
+ OUTPUT_VARIABLE _gcc_version_info |
| 43 |
+ ERROR_VARIABLE _gcc_version_info) |
| 44 |
+- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" |
| 45 |
++ string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]" |
| 46 |
+ _gcc_version "${_gcc_version_info}") |
| 47 |
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the |
| 48 |
+ # patch level, handle this here: |
| 49 |
|
| 50 |
diff --git a/sci-libs/vtk/vtk-6.1.0-r3.ebuild b/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 51 |
index 7367f5ccbe6..1345bde683e 100644 |
| 52 |
--- a/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 53 |
+++ b/sci-libs/vtk/vtk-6.1.0-r3.ebuild |
| 54 |
@@ -124,6 +124,7 @@ PATCHES=( |
| 55 |
"${FILESDIR}"/${P}-glext.patch |
| 56 |
"${FILESDIR}"/${P}-memset.patch |
| 57 |
"${FILESDIR}"/${P}-gdal2.patch |
| 58 |
+ "${FILESDIR}"/${P}-gcc67.patch |
| 59 |
) |
| 60 |
|
| 61 |
RESTRICT=test |
| 62 |
|
| 63 |
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 64 |
index 9f22a8e6793..409b62823c8 100644 |
| 65 |
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 66 |
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild |
| 67 |
@@ -124,6 +124,7 @@ PATCHES=( |
| 68 |
"${FILESDIR}"/${P}-glext.patch |
| 69 |
"${FILESDIR}"/${P}-memset.patch |
| 70 |
"${FILESDIR}"/${P}-gdal2.patch |
| 71 |
+ "${FILESDIR}"/${P}-gcc67.patch |
| 72 |
) |
| 73 |
|
| 74 |
RESTRICT=test |
Archives