diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-17 16:20:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-04 11:06:55 +0100 |
commit | 03476d52cd389f0ad4ece62dd70cabb39ea0b524 (patch) | |
tree | dd1c646230b5ff42ff5c14a098d7ec8e43fe9a1c /meta/recipes-core | |
parent | 677b00feeb6b127883daeed3bee04b0601326cb7 (diff) | |
download | poky-03476d52cd389f0ad4ece62dd70cabb39ea0b524.tar.gz |
fixup
(From OE-Core rev: e1faf9ac7e89d33aba33547ede19a10aaa034207)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc/relocate-locales.patch | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/meta/recipes-core/glibc/glibc/relocate-locales.patch b/meta/recipes-core/glibc/glibc/relocate-locales.patch index 2aea37f5ca..11f7df4aca 100644 --- a/meta/recipes-core/glibc/glibc/relocate-locales.patch +++ b/meta/recipes-core/glibc/glibc/relocate-locales.patch | |||
@@ -5,46 +5,24 @@ magic segment that we can relocate at install time. | |||
5 | Upstream-Status: Inappropriate (OE-specific) | 5 | Upstream-Status: Inappropriate (OE-specific) |
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 6 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
7 | 7 | ||
8 | diff --git a/locale/findlocale.c b/locale/findlocale.c | 8 | Index: git/locale/localeinfo.h |
9 | index 872cadb5..da14fa39 100644 | 9 | =================================================================== |
10 | --- a/locale/findlocale.c | 10 | --- git.orig/locale/localeinfo.h |
11 | +++ b/locale/findlocale.c | 11 | +++ git/locale/localeinfo.h |
12 | @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = | 12 | @@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int categor |
13 | which are somehow addressed. */ | ||
14 | struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; | ||
15 | |||
16 | -const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR; | ||
17 | +char _nl_default_locale_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR; | ||
18 | |||
19 | /* Checks if the name is actually present, that is, not NULL and not | ||
20 | empty. */ | ||
21 | @@ -167,7 +167,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, | ||
22 | |||
23 | /* Nothing in the archive. Set the default path to search below. */ | ||
24 | locale_path = _nl_default_locale_path; | ||
25 | - locale_path_len = sizeof _nl_default_locale_path; | ||
26 | + locale_path_len = strlen(locale_path) + 1; | ||
27 | } | ||
28 | else | ||
29 | /* We really have to load some data. First see whether the name is | ||
30 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h | ||
31 | index 68822a63..537bc351 100644 | ||
32 | --- a/locale/localeinfo.h | ||
33 | +++ b/locale/localeinfo.h | ||
34 | @@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item) | ||
35 | } | 13 | } |
36 | 14 | ||
37 | /* Default search path if no LOCPATH environment variable. */ | 15 | /* Default search path if no LOCPATH environment variable. */ |
38 | -extern const char _nl_default_locale_path[] attribute_hidden; | 16 | -extern char _nl_default_locale_path[] attribute_hidden; |
39 | +extern char _nl_default_locale_path[4096] attribute_hidden; | 17 | +extern char _nl_default_locale_path[4096] attribute_hidden; |
40 | 18 | ||
41 | /* Load the locale data for CATEGORY from the file specified by *NAME. | 19 | /* Load the locale data for CATEGORY from the file specified by *NAME. |
42 | If *NAME is "", use environment variables as specified by POSIX, and | 20 | If *NAME is "", use environment variables as specified by POSIX, and |
43 | diff --git a/locale/loadarchive.c b/locale/loadarchive.c | 21 | Index: git/locale/loadarchive.c |
44 | index 516d30d8..792b37fb 100644 | 22 | =================================================================== |
45 | --- a/locale/loadarchive.c | 23 | --- git.orig/locale/loadarchive.c |
46 | +++ b/locale/loadarchive.c | 24 | +++ git/locale/loadarchive.c |
47 | @@ -42,7 +43,7 @@ | 25 | @@ -42,7 +42,7 @@ |
48 | 26 | ||
49 | 27 | ||
50 | /* Name of the locale archive file. */ | 28 | /* Name of the locale archive file. */ |