[gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/, dev-libs/libintl/files/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     fbc240f551b32a009511d34ac5c3fd7c15ef82b9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 03:32:49 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 03:32:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc240f5

dev-libs/libintl: fix build in bionic systems

 .../libintl/files/libintl-0.19.5-langinfo.patch    | 35 ++++++++++++++++++++++
 dev-libs/libintl/libintl-0.19.6.ebuild             |  2 ++
 2 files changed, 37 insertions(+)

diff --git a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
new file mode 100644
index 0000000..bf96e69
--- /dev/null
+++ b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
@@ -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
+

diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
index 5c78826..a8fbdac 100644
--- a/dev-libs/libintl/libintl-0.19.6.ebuild
+++ b/dev-libs/libintl/libintl-0.19.6.ebuild
@@ -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}"