From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 900B21382C5 for ; Sat, 6 Jun 2020 09:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0109E0963; Sat, 6 Jun 2020 09:42:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A37B2E0963 for ; Sat, 6 Jun 2020 09:42:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B001C34F237 for ; Sat, 6 Jun 2020 09:42:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4008C288 for ; Sat, 6 Jun 2020 09:42:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591436510.64839f71f4892ca57ce5e36648b9a2b1c8a60822.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch sci-libs/vtk/vtk-8.2.0.ebuild X-VCS-Directories: sci-libs/vtk/ sci-libs/vtk/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 64839f71f4892ca57ce5e36648b9a2b1c8a60822 X-VCS-Branch: master Date: Sat, 6 Jun 2020 09:42:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 338fc0b3-bade-4720-a692-c8bd1f4ea65b X-Archives-Hash: d19e2e2d31acdce4df7289d800ea877f commit: 64839f71f4892ca57ce5e36648b9a2b1c8a60822 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 09:19:08 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 09:41:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64839f71 sci-libs/vtk: Fix CMake detection of GCC 10 Thanks-to: Tiernan Hubble gmail.com> Closes: https://bugs.gentoo.org/723374 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> 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(+) 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 00000000000..a903b037530 --- /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 1097c4df324..0538637cc2a 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"