mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
Merge updates from master
This commit is contained in:
@@ -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 {
|
||||
@@ -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
|
||||
@@ -182,6 +184,19 @@ multilib_src_configure() {
|
||||
export LIBFFI_LIBS="-lffi"
|
||||
fi
|
||||
|
||||
# These configure tests don't work when cross-compiling.
|
||||
if tc-is-cross-compiler ; then
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
|
||||
case ${CHOST} in
|
||||
hppa*|metag*) export glib_cv_stack_grows=yes ;;
|
||||
*) export glib_cv_stack_grows=no ;;
|
||||
esac
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756474
|
||||
export glib_cv_uscore=no
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=756475
|
||||
export ac_cv_func_posix_get{pwuid,grgid}_r=yes
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
case "${CHOST}" in
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
this has been sent upstream
|
||||
|
||||
From eac944b0757963ac1ba035ea72617734510ede22 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@chromium.org>
|
||||
Date: Mon, 12 Oct 2015 17:58:51 -0400
|
||||
Subject: [PATCH] intl/localename: control langinfo.h inclusion
|
||||
|
||||
This header is only used to work around buggy behavior in old versions
|
||||
of glibc, so do not include it all the time. Otherwise we get build
|
||||
failures on systems that do not provide langinfo.h.
|
||||
|
||||
* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
|
||||
ifdefs used in the source later on.
|
||||
---
|
||||
gettext-runtime/intl/localename.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
|
||||
index f8cf3f2..c27be86 100644
|
||||
--- a/gettext-runtime/intl/localename.c
|
||||
+++ b/gettext-runtime/intl/localename.c
|
||||
@@ -38,7 +38,9 @@
|
||||
# if defined __APPLE__ && defined __MACH__
|
||||
# include <xlocale.h>
|
||||
# endif
|
||||
-# include <langinfo.h>
|
||||
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
|
||||
+# include <langinfo.h>
|
||||
+# endif
|
||||
# if !defined IN_LIBINTL
|
||||
# include "glthread/lock.h"
|
||||
# endif
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@@ -28,6 +28,8 @@ RDEPEND="${DEPEND}
|
||||
S="${WORKDIR}/${MY_P}/gettext-runtime"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.19.5-langinfo.patch
|
||||
|
||||
# The libtool files are stored higher up, so make sure we run in the
|
||||
# whole tree and not just the subdir we build.
|
||||
elibtoolize "${WORKDIR}"
|
||||
|
||||
Reference in New Issue
Block a user