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 2436A1381F1 for ; Wed, 4 Apr 2018 21:10:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A237E0ABA; Wed, 4 Apr 2018 21:10:19 +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 178A7E0ABA for ; Wed, 4 Apr 2018 21:10:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8EC33335C7B for ; Wed, 4 Apr 2018 21:10:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BACC627E for ; Wed, 4 Apr 2018 21:10:08 +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: <1522876172.f602ce29a225b52165cf735a263c65a6a8774f36.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch sci-geosciences/grass/grass-7.2.0-r1.ebuild X-VCS-Directories: sci-geosciences/grass/ sci-geosciences/grass/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f602ce29a225b52165cf735a263c65a6a8774f36 X-VCS-Branch: master Date: Wed, 4 Apr 2018 21:10:08 +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-Archives-Salt: 95e6029a-0f75-4330-8c1c-8d3c69addb9b X-Archives-Hash: 779b2e013c130b217895f0d367702ad7 commit: f602ce29a225b52165cf735a263c65a6a8774f36 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 4 21:01:04 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 4 21:09:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f602ce29 sci-geosciences/grass: Fix build with glibc-2.26 Reported-by: Martin von Gagern gmx.net> Thanks-to: MarisN gmail.com> Closes: https://bugs.gentoo.org/588980 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../grass/files/grass-7.2.0-glibc-2.26-1.patch | 10 +++++++ .../grass/files/grass-7.2.0-glibc-2.26-2.patch | 32 ++++++++++++++++++++++ sci-geosciences/grass/grass-7.2.0-r1.ebuild | 1 + 3 files changed, 43 insertions(+) diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch new file mode 100644 index 00000000000..115ff06febc --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch @@ -0,0 +1,10 @@ +Index: /grass/trunk/lib/raster/R.h +=================================================================== +--- /grass/trunk/lib/raster/R.h (revision 71264) ++++ /grass/trunk/lib/raster/R.h (revision 71265) +@@ -1,5 +1,4 @@ + #include + #include +-#include + #ifdef HAVE_GDAL + #include diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch new file mode 100644 index 00000000000..c1361f6af08 --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch @@ -0,0 +1,32 @@ +Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c +=================================================================== +--- /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71943) ++++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c (revision 71944) +@@ -15,6 +15,4 @@ + #include + #include +- +-#include /* need this for sgi */ + + #include +Index: /grass/branches/releasebranch_7_2/lib/raster/open.c +=================================================================== +--- /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71943) ++++ /grass/branches/releasebranch_7_2/lib/raster/open.c (revision 71944) +@@ -13,6 +13,4 @@ + */ + +-#include +-#include + #include + #include +Index: /grass/branches/releasebranch_7_2/lib/raster/range.c +=================================================================== +--- /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71943) ++++ /grass/branches/releasebranch_7_2/lib/raster/range.c (revision 71944) +@@ -13,5 +13,4 @@ + + #include +-#include /* need this for sgi */ + + #include diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild index 00657af184e..233823e1fa4 100644 --- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild +++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild @@ -79,6 +79,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch "${FILESDIR}/${P}"-gcc7.patch + "${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch ) pkg_setup() {