summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2017-12-06 13:46:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-07 13:14:52 +0000
commit8c84d07063ea0ebe8f335fafc2e619555bdab812 (patch)
tree78b764b0d39aa1d7657f75c6ebfdc854f0de1374 /meta/recipes-core/glibc
parent04f0f7f124a8e9418797a46692ac1c60700cb61b (diff)
downloadpoky-8c84d07063ea0ebe8f335fafc2e619555bdab812.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) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.24.bb1
-rw-r--r--meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch27
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
index d4cccedb43..4a77eee2c9 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.24.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..634f8d8644
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch
@@ -0,0 +1,27 @@
1From abfeb0cf4e3261a66a7a23abc9aed33c034c850d Mon Sep 17 00:00:00 2001
2From: Joshua Watt <Joshua.Watt@garmin.com>
3Date: Wed, 6 Dec 2017 13:26:19 -0600
4Subject: [PATCH] Include locale_t.h compatibility header
5
6Newer versions of glibc (since 2.26) moved the locale typedefs from
7xlocale.h to bits/types/locale_t.h. Create a compatibility header for
8these newer versions of glibc
9
10See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc
11
12Upstream-Status: Inappropriate
13---
14 locale/bits/types/locale_t.h | 1 +
15 1 file changed, 1 insertion(+)
16 create mode 100644 locale/bits/types/locale_t.h
17
18diff --git a/locale/bits/types/locale_t.h b/locale/bits/types/locale_t.h
19new file mode 100644
20index 0000000000..b519a6c5f8
21--- /dev/null
22+++ b/locale/bits/types/locale_t.h
23@@ -0,0 +1 @@
24+#include <xlocale.h>
25--
262.14.3
27