public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
Date: Wed,  4 Apr 2018 21:10:08 +0000 (UTC)	[thread overview]
Message-ID: <1522876172.f602ce29a225b52165cf735a263c65a6a8774f36.asturm@gentoo> (raw)

commit:     f602ce29a225b52165cf735a263c65a6a8774f36
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 21:01:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <Martin.vGagern <AT> gmx.net>
Thanks-to: MarisN <maris.gis <AT> 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 <grass/config.h>
+ #include <grass/gis.h>
+-#include <rpc/types.h>
+ #ifdef HAVE_GDAL
+ #include <gdal.h>

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 <unistd.h>
+ #include <sys/types.h>
+-
+-#include <rpc/types.h>		/* need this for sgi */
+ 
+ #include <grass/config.h>
+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 <rpc/types.h>
+-#include <rpc/xdr.h>
+ #include <unistd.h>
+ #include <string.h>
+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 <unistd.h>
+-#include <rpc/types.h>		/* need this for sgi */
+ 
+ #include <grass/raster.h>

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() {


             reply	other threads:[~2018-04-04 21:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-04 21:10 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-20  2:53 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/ Sam James
2022-05-23 11:59 Conrad Kostecki
2022-01-29  6:20 Sam James
2022-01-02  7:05 Sam James
2021-05-29 17:46 Sam James
2019-06-27 17:21 Andreas Sturmlechner
2015-12-05 13:55 Amy Winston
2015-10-23  6:53 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1522876172.f602ce29a225b52165cf735a263c65a6a8774f36.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox