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:01:57 +0000 |
| commit | ab2bbccf9afb1db05a1f9fbcb5ec31bc1e4cb5eb (patch) | |
| tree | 20ad2e12ca44ea63366934d86d9d9dad655771e1 | |
| parent | 81ba29c7b9c872d9a9c2efe5f9f8fe6a492af813 (diff) | |
| download | openembedded-core-ab2bbccf9afb1db05a1f9fbcb5ec31bc1e4cb5eb.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -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 \ file://0023-eglibc-Install-PIC-archives.patch \ file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ + file://0001-Include-locale_t.h-compatibility-header.patch \ " # Makes for a rather long rev (22 characters), but... # 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 @@ +From abfeb0cf4e3261a66a7a23abc9aed33c034c850d Mon Sep 17 00:00:00 2001 +From: Joshua Watt <Joshua.Watt@garmin.com> +Date: Wed, 6 Dec 2017 13:26:19 -0600 +Subject: [PATCH] Include locale_t.h compatibility header + +Newer versions of glibc (since 2.26) moved the locale typedefs from +xlocale.h to bits/types/locale_t.h. Create a compatibility header for +these newer versions of glibc + +See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc + +Upstream-Status: Inappropriate compatibility with newer host glibc +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> + +--- + locale/bits/types/locale_t.h | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 locale/bits/types/locale_t.h + +diff --git a/locale/bits/types/locale_t.h b/locale/bits/types/locale_t.h +new file mode 100644 +index 0000000000..b519a6c5f8 +--- /dev/null ++++ b/locale/bits/types/locale_t.h +@@ -0,0 +1 @@ ++#include <xlocale.h> +-- +2.14.3 + |