summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-06 11:19:08 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-06 11:41:50 +0200
commit64839f71f4892ca57ce5e36648b9a2b1c8a60822 (patch)
treeb57ee0c32a111400ffa892a695665c4e9e861de4 /sci-libs/vtk/files
parentsci-libs/vtk: Fix build with Qt 5.15 (diff)
downloadgentoo-64839f71f4892ca57ce5e36648b9a2b1c8a60822.tar.gz
gentoo-64839f71f4892ca57ce5e36648b9a2b1c8a60822.tar.bz2
gentoo-64839f71f4892ca57ce5e36648b9a2b1c8a60822.zip
sci-libs/vtk: Fix CMake detection of GCC 10
Thanks-to: Tiernan Hubble <tiernanhubble+gentoo@gmail.com> Closes: https://bugs.gentoo.org/723374 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/vtk/files')
-rw-r--r--sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
new file mode 100644
index 000000000000..a903b0375304
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
@@ -0,0 +1,16 @@
+--- a/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:12.154603698 -0600
++++ b/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:34.864603776 -0600
+@@ -174,8 +174,12 @@
+ 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 "[1-9][0-9]\\.[0-9]\\.[0-9]*"
+ _gcc_version "${_gcc_version_info}")
++ if(NOT _gcc_version)
++ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++ _gcc_version "${_gcc_version_info}")
++ endif()
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+ # patch level, handle this here:
+ if(NOT _gcc_version) \ No newline at end of file