[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     26928529bd50baa3f6a6ef0a77eb4012c82a0fd1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 17:22:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 17:23:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26928529

sci-libs/gdal: Backport patch for glibc-2.22

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563608

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch | 14 ++++++++++++++
 sci-libs/gdal/gdal-2.0.0-r1.ebuild                       |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
new file mode 100644
index 0000000..f23ff76
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch
@@ -0,0 +1,14 @@
+Index: /branches/2.0/gdal/apps/gdalserver.c
+===================================================================
+--- /branches/2.0/gdal/apps/gdalserver.c	(revision 29667)
++++ /branches/2.0/gdal/apps/gdalserver.c	(revision 29668)
+@@ -28,7 +28,6 @@
+  ****************************************************************************/
+ 
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+ 
+ #include "cpl_port.h"

diff --git a/sci-libs/gdal/gdal-2.0.0-r1.ebuild b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
index 8f44889..6a34452 100644
--- a/sci-libs/gdal/gdal-2.0.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.0.0-r1.ebuild
@@ -80,6 +80,8 @@ pkg_setup() {
 src_prepare() {
 	java-pkg-opt-2_src_prepare
 
+	epatch "${FILESDIR}"/${P}-glibc-2.22-backport.patch
+
 	# fix datadir and docdir placement
 	sed -i \
 		-e "s:@datadir@:@datadir@/gdal:" \