From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Cc: Bernhard Walle <bernhard@bwalle.de>
Subject: [ptxdist] [PATCH] host-localedef: Fix build with glibc 2.26
Date: Mon, 2 Oct 2017 18:18:53 +0200 [thread overview]
Message-ID: <20171002161853.25210-1-bernhard@bwalle.de> (raw)
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
.../0003-Don-t-include-xlocale.h.patch | 47 ++++++++++++++++++++++
patches/localedef-eglibc-2.14.1-r17443-ptx1/series | 3 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch
diff --git a/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch b/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch
new file mode 100644
index 000000000..97180444a
--- /dev/null
+++ b/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch
@@ -0,0 +1,47 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Mon, 2 Oct 2017 16:55:23 +0200
+Subject: [PATCH] Don't include <xlocale.h>
+
+This header has been removed in glibc 2.26:
+
+https://abi-laboratory.pro/tracker/changelog/glibc/2.26/log.html
+
+------------------------ >8 ------------------------
+* The nonstandard header <xlocale.h> has been removed. Most programs should
+ use <locale.h> instead. If you have a specific need for the definition of
+ locale_t with no other declarations, please contact
+ libc-alpha@sourceware.org and explain.
+------------------------ 8< ------------------------
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ eglibc/locale/langinfo.h | 2 +-
+ eglibc/locale/locale.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/eglibc/locale/langinfo.h b/eglibc/locale/langinfo.h
+index 0a5336507196..76707a4584c1 100644
+--- a/eglibc/locale/langinfo.h
++++ b/eglibc/locale/langinfo.h
+@@ -589,7 +589,7 @@ extern char *nl_langinfo (nl_item __item) __THROW;
+ more information. */
+
+ /* Get locale datatype definition. */
+-# include <xlocale.h>
++# include <locale.h>
+
+ /* Just like nl_langinfo but get the information from the locale object L. */
+ extern char *nl_langinfo_l (nl_item __item, __locale_t __l);
+diff --git a/eglibc/locale/locale.h b/eglibc/locale/locale.h
+index 2aa19e76acb2..18be711a2d40 100644
+--- a/eglibc/locale/locale.h
++++ b/eglibc/locale/locale.h
+@@ -143,7 +143,7 @@ __END_NAMESPACE_STD
+ This is a proof-of-concept implementation. */
+
+ /* Get locale datatype definition. */
+-# include <xlocale.h>
++# include_next <locale.h>
+
+ /* Return a reference to a data structure representing a set of locale
+ datasets. Unlike for the CATEGORY parameter for `setlocale' the
diff --git a/patches/localedef-eglibc-2.14.1-r17443-ptx1/series b/patches/localedef-eglibc-2.14.1-r17443-ptx1/series
index 976f166d3..7d9691a33 100644
--- a/patches/localedef-eglibc-2.14.1-r17443-ptx1/series
+++ b/patches/localedef-eglibc-2.14.1-r17443-ptx1/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-argp-fmtstream.h-Force-inlining-of-extern-inline-fun.patch
0002-set-and-use-LDFLAGS.patch
-# 2f6c634f07e60a324a5c4230b566fa54 - git-ptx-patches magic
+0003-Don-t-include-xlocale.h.patch
+# 372be4295bac0da8e084aba7918b9092 - git-ptx-patches magic
--
2.14.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-10-02 16:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171002161853.25210-1-bernhard@bwalle.de \
--to=bernhard@bwalle.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox