summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-10-24 19:22:40 +0200
committerJustin Lecher <jlec@gentoo.org>2015-10-24 19:23:02 +0200
commit26928529bd50baa3f6a6ef0a77eb4012c82a0fd1 (patch)
tree0c82bd7a22dc46cba790f96f647a609e96e6356d
parentsys-apps/haveged: clean up older versions. (diff)
downloadgentoo-26928529bd50baa3f6a6ef0a77eb4012c82a0fd1.tar.gz
gentoo-26928529bd50baa3f6a6ef0a77eb4012c82a0fd1.tar.bz2
gentoo-26928529bd50baa3f6a6ef0a77eb4012c82a0fd1.zip
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@gentoo.org>
-rw-r--r--sci-libs/gdal/files/gdal-2.0.0-glibc-2.22-backport.patch14
-rw-r--r--sci-libs/gdal/gdal-2.0.0-r1.ebuild2
2 files changed, 16 insertions, 0 deletions
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 000000000000..f23ff76ab2e8
--- /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 8f448890e6d0..6a344526788b 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:" \