diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-10-12 23:23:40 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-12 23:24:01 -0400 |
| commit | c9a77e1ab93d5af9968d3e449569832aff61c2df (patch) | |
| tree | b2bdbf848335f37416284645d49098463b012686 /dev-libs/glib | |
| parent | dev-libs/glib: add various cross-compile settings (diff) | |
| download | gentoo-c9a77e1ab93d5af9968d3e449569832aff61c2df.tar.gz gentoo-c9a77e1ab93d5af9968d3e449569832aff61c2df.tar.bz2 gentoo-c9a77e1ab93d5af9968d3e449569832aff61c2df.zip | |
dev-libs/glib: fix builds w/newer bionic versions
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch | 15 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.44.1-r1.ebuild | 2 |
2 files changed, 17 insertions, 0 deletions
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 |