sci-geosciences/grass: Fix build with glibc-2.26

Reported-by: Martin von Gagern <Martin.vGagern@gmx.net>
Thanks-to: MarisN <maris.gis@gmail.com>
Closes: https://bugs.gentoo.org/588980
Package-Manager: Portage-2.3.28, Repoman-2.3.9

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 (file)
index 0000000..115ff06
--- /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 (file)
index 0000000..c1361f6
--- /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\r
+===================================================================\r
+--- /grass/branches/releasebranch_7_2/lib/raster/get_row.c     (revision 71943)\r
++++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c     (revision 71944)\r
+@@ -15,6 +15,4 @@\r
+ #include <unistd.h>\r
+ #include <sys/types.h>\r
+-\r
+-#include <rpc/types.h>                /* need this for sgi */\r
+ \r
+ #include <grass/config.h>\r
+Index: /grass/branches/releasebranch_7_2/lib/raster/open.c\r
+===================================================================\r
+--- /grass/branches/releasebranch_7_2/lib/raster/open.c        (revision 71943)\r
++++ /grass/branches/releasebranch_7_2/lib/raster/open.c        (revision 71944)\r
+@@ -13,6 +13,4 @@\r
+  */\r
+ \r
+-#include <rpc/types.h>\r
+-#include <rpc/xdr.h>\r
+ #include <unistd.h>\r
+ #include <string.h>\r
+Index: /grass/branches/releasebranch_7_2/lib/raster/range.c\r
+===================================================================\r
+--- /grass/branches/releasebranch_7_2/lib/raster/range.c       (revision 71943)\r
++++ /grass/branches/releasebranch_7_2/lib/raster/range.c       (revision 71944)\r
+@@ -13,5 +13,4 @@\r
+ \r
+ #include <unistd.h>\r
+-#include <rpc/types.h>                /* need this for sgi */\r
+ \r
+ #include <grass/raster.h>\r

diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 00657af184ed1ad5dab27abb54736c0a68d2456f..233823e1fa49a298edb1a9872670f08392ac7925 100644 (file)
--- 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() {