diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2017-12-06 13:46:28 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-11 22:02:59 +0000 |
commit | a75a2f4272226e924d8c9deb699a19ca9e606a5b (patch) | |
tree | 906e4465009600c979c6388dd4f9cbc929320aac | |
parent | 3413d7ac24dafc9ead0247e532400fb9052444fe (diff) | |
download | poky-a75a2f4272226e924d8c9deb699a19ca9e606a5b.tar.gz |
cross-localedef-native: Include locale_t.h
Newer versions of glibc (2.26) moved the struct locale definition from
xlocale.h to bits/types/locale_t.h. For compatibility with build hosts
using this version of glibc, include this header.
See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc
(From OE-Core rev: 4e9bb9ab2e5c603f3eb2d52ce272401c8e320cc0)
(From OE-Core rev: ab2bbccf9afb1db05a1f9fbcb5ec31bc1e4cb5eb)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/glibc/cross-localedef-native_2.25.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.25.bb b/meta/recipes-core/glibc/cross-localedef-native_2.25.bb index cbd16f7263..fae8683eed 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.25.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.25.bb | |||
@@ -36,6 +36,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ | |||
36 | file://0023-eglibc-Install-PIC-archives.patch \ | 36 | file://0023-eglibc-Install-PIC-archives.patch \ |
37 | file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ | 37 | file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ |
38 | file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ | 38 | file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ |
39 | file://0001-Include-locale_t.h-compatibility-header.patch \ | ||
39 | " | 40 | " |
40 | # Makes for a rather long rev (22 characters), but... | 41 | # Makes for a rather long rev (22 characters), but... |
41 | # | 42 | # |
diff --git a/meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch b/meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch new file mode 100644 index 0000000000..a13c428e13 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From abfeb0cf4e3261a66a7a23abc9aed33c034c850d Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Watt <Joshua.Watt@garmin.com> | ||
3 | Date: Wed, 6 Dec 2017 13:26:19 -0600 | ||
4 | Subject: [PATCH] Include locale_t.h compatibility header | ||
5 | |||
6 | Newer versions of glibc (since 2.26) moved the locale typedefs from | ||
7 | xlocale.h to bits/types/locale_t.h. Create a compatibility header for | ||
8 | these newer versions of glibc | ||
9 | |||
10 | See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc | ||
11 | |||
12 | Upstream-Status: Inappropriate compatibility with newer host glibc | ||
13 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
14 | |||
15 | --- | ||
16 | locale/bits/types/locale_t.h | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | create mode 100644 locale/bits/types/locale_t.h | ||
19 | |||
20 | diff --git a/locale/bits/types/locale_t.h b/locale/bits/types/locale_t.h | ||
21 | new file mode 100644 | ||
22 | index 0000000000..b519a6c5f8 | ||
23 | --- /dev/null | ||
24 | +++ b/locale/bits/types/locale_t.h | ||
25 | @@ -0,0 +1 @@ | ||
26 | +#include <xlocale.h> | ||
27 | -- | ||
28 | 2.14.3 | ||
29 | |||