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 997A21382C5 for ; Sat, 6 Jun 2020 10:04:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9477E0957; Sat, 6 Jun 2020 10:04:09 +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 99F09E0957 for ; Sat, 6 Jun 2020 10:04:09 +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 666D634F1FA for ; Sat, 6 Jun 2020 10:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C141F27E for ; Sat, 6 Jun 2020 10:04:04 +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: <1591436900.49f290c037ace1ceb2ef4a6b7800baa262d3149d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/files/vtk-8.2.0-fno-common.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: 49f290c037ace1ceb2ef4a6b7800baa262d3149d X-VCS-Branch: master Date: Sat, 6 Jun 2020 10:04:04 +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: d43023ae-4eba-4dec-a0a2-eab824466346 X-Archives-Hash: 676ce61e49649696b231f7e355e2f095 commit: 49f290c037ace1ceb2ef4a6b7800baa262d3149d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 6 09:46:17 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 6 09:48:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f290c0 sci-libs/vtk: Fix build with -fno-common Thanks-to: Tiernan Hubble gmail.com> Closes: https://bugs.gentoo.org/721048 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-fno-common.patch | 40 +++++++++++++++++++++++++++ sci-libs/vtk/vtk-8.2.0.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch new file mode 100644 index 00000000000..d7268ef7566 --- /dev/null +++ b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch @@ -0,0 +1,40 @@ +From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001 +From: Seacas Upstream +Date: Tue, 28 Jan 2020 09:13:38 -0500 +Subject: [PATCH] exodusII 2020-01-28 (d97eb08d) + +Code extracted from: + + https://gitlab.kitware.com/third-party/seacas.git + +at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18). +--- + ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +- + ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c +index 8d5d6734f0..ef439618da 100644 +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c +@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_create_par; + #endif +diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c +index b2faa22c29..9df4818767 100644 +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c +@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_open_par; + #endif +-- +2.26.2 + diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild index 3ad36f8c446..6da25f5916c 100644 --- a/sci-libs/vtk/vtk-8.2.0.ebuild +++ b/sci-libs/vtk/vtk-8.2.0.ebuild @@ -127,6 +127,7 @@ 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 + "${FILESDIR}"/${P}-fno-common.patch # bug 721048 ) RESTRICT="test"