From 64839f71f4892ca57ce5e36648b9a2b1c8a60822 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 6 Jun 2020 11:19:08 +0200 Subject: sci-libs/vtk: Fix CMake detection of GCC 10 Thanks-to: Tiernan Hubble Closes: https://bugs.gentoo.org/723374 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch | 16 ++++++++++++++++ sci-libs/vtk/vtk-8.2.0.ebuild | 1 + 2 files changed, 17 insertions(+) create mode 100644 sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch (limited to 'sci-libs/vtk') 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 diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild index 1097c4df324f..0538637cc2a7 100644 --- a/sci-libs/vtk/vtk-8.2.0.ebuild +++ b/sci-libs/vtk/vtk-8.2.0.ebuild @@ -126,6 +126,7 @@ S="${WORKDIR}"/VTK-${PV} PATCHES=( "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960 + "${FILESDIR}"/${P}-gcc-10.patch # bug 723374 ) RESTRICT="test" -- cgit v1.2.3-65-gdbad