From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 13 Oct 2015 03:23:40 +0000 (-0400)
Subject: dev-libs/glib: fix builds w/newer bionic versions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c9a77e1ab93d5af9968d3e449569832aff61c2df;p=gentoo.git

dev-libs/glib: fix builds w/newer bionic versions
---

diff --git a/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
new file mode 100644
index 000000000000..259b5720c127
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
@@ -0,0 +1,15 @@
+https://bugzilla.gnome.org/756477
+
+fix build w/newer releases of bionic (android)
+
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver     *resolver,
+ 
+ #if defined(G_OS_UNIX)
+ 
+-#ifdef __BIONIC__
++#if defined __BIONIC__ && !defined BIND_4_COMPAT
+ /* Copy from bionic/libc/private/arpa_nameser_compat.h
+  * and bionic/libc/private/arpa_nameser.h */
+ typedef struct {
diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
index d5302bc47c26..25be8706448d 100644
--- a/dev-libs/glib/glib-2.44.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -151,6 +151,8 @@ src_prepare() {
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
 
+	epatch "${FILESDIR}/${PN}-2.44.1-bionic-nameser.patch"
+
 	# leave python shebang alone
 	sed -e '/${PYTHON}/d' \
 		-i glib/Makefile.{am,in} || die