summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-10-12 23:32:49 -0400
committerMike Frysinger <vapier@gentoo.org>2015-10-12 23:32:49 -0400
commitfbc240f551b32a009511d34ac5c3fd7c15ef82b9 (patch)
tree63a7ad184dd2c0cff0529991ec435f6113cda7fd /dev-libs/libintl/files
parentdev-libs/glib: fix builds w/newer bionic versions (diff)
downloadgentoo-fbc240f551b32a009511d34ac5c3fd7c15ef82b9.tar.gz
gentoo-fbc240f551b32a009511d34ac5c3fd7c15ef82b9.tar.bz2
gentoo-fbc240f551b32a009511d34ac5c3fd7c15ef82b9.zip
dev-libs/libintl: fix build in bionic systems
Diffstat (limited to 'dev-libs/libintl/files')
-rw-r--r--dev-libs/libintl/files/libintl-0.19.5-langinfo.patch35
1 files changed, 35 insertions, 0 deletions
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 000000000000..bf96e69f924c
--- /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
+