diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2017-10-02 18:18:53 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-10-10 14:24:27 +0200 |
| commit | 1485632de32af9ef6835b2f011ab2a0bc6805a06 (patch) | |
| tree | 3b061312b1fccb1fb24b81d6f7f08022ee230f19 | |
| parent | 28f4f55fb7a65cc613f886cb3ef9afef676081ba (diff) | |
| download | ptxdist-1485632de32af9ef6835b2f011ab2a0bc6805a06.tar.gz ptxdist-1485632de32af9ef6835b2f011ab2a0bc6805a06.tar.xz | |
host-localedef: Fix build with glibc 2.26
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch | 47 | ||||
| -rw-r--r-- | patches/localedef-eglibc-2.14.1-r17443-ptx1/series | 3 |
2 files changed, 49 insertions, 1 deletions
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 |