diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index 27cd17cdcd..729ce1b42d 100644 --- a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3df91d1d8b9c7a01b3ef8133c4f9b9764227d583 Mon Sep 17 00:00:00 2001 | 1 | From 9a8bf11ea375a2fe5eddb30bc10943e64d3b96a4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 3 Aug 2018 09:55:12 -0700 | 3 | Date: Fri, 3 Aug 2018 09:55:12 -0700 |
4 | Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales | 4 | Subject: [PATCH 07/29] nativesdk-glibc: Make relocatable install for locales |
5 | 5 | ||
6 | The glibc locale path is hard-coded to the install prefix, but in SDKs we need | 6 | The glibc locale path is hard-coded to the install prefix, but in SDKs we need |
7 | to be able to relocate the binaries. Expand the strings to 4K and put them in a | 7 | to be able to relocate the binaries. Expand the strings to 4K and put them in a |
@@ -12,16 +12,17 @@ Upstream-Status: Inappropriate (OE-specific) | |||
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 12 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | 14 | --- |
15 | locale/findlocale.c | 4 ++-- | 15 | locale/findlocale.c | 4 ++-- |
16 | locale/loadarchive.c | 2 +- | 16 | locale/loadarchive.c | 2 +- |
17 | locale/localeinfo.h | 2 +- | 17 | locale/localeinfo.h | 2 +- |
18 | 3 files changed, 4 insertions(+), 4 deletions(-) | 18 | locale/programs/locale.c | 7 ++++--- |
19 | 4 files changed, 8 insertions(+), 7 deletions(-) | ||
19 | 20 | ||
20 | Index: git/locale/findlocale.c | 21 | diff --git a/locale/findlocale.c b/locale/findlocale.c |
21 | =================================================================== | 22 | index 9cd3b71a6d..84272310e0 100644 |
22 | --- git.orig/locale/findlocale.c | 23 | --- a/locale/findlocale.c |
23 | +++ git/locale/findlocale.c | 24 | +++ b/locale/findlocale.c |
24 | @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr | 25 | @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = |
25 | which are somehow addressed. */ | 26 | which are somehow addressed. */ |
26 | struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; | 27 | struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; |
27 | 28 | ||
@@ -30,7 +31,7 @@ Index: git/locale/findlocale.c | |||
30 | 31 | ||
31 | /* Checks if the name is actually present, that is, not NULL and not | 32 | /* Checks if the name is actually present, that is, not NULL and not |
32 | empty. */ | 33 | empty. */ |
33 | @@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path | 34 | @@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, |
34 | 35 | ||
35 | /* Nothing in the archive. Set the default path to search below. */ | 36 | /* Nothing in the archive. Set the default path to search below. */ |
36 | locale_path = _nl_default_locale_path; | 37 | locale_path = _nl_default_locale_path; |
@@ -39,10 +40,10 @@ Index: git/locale/findlocale.c | |||
39 | } | 40 | } |
40 | else | 41 | else |
41 | /* We really have to load some data. First see whether the name is | 42 | /* We really have to load some data. First see whether the name is |
42 | Index: git/locale/loadarchive.c | 43 | diff --git a/locale/loadarchive.c b/locale/loadarchive.c |
43 | =================================================================== | 44 | index ba0fe45648..9737fd4cda 100644 |
44 | --- git.orig/locale/loadarchive.c | 45 | --- a/locale/loadarchive.c |
45 | +++ git/locale/loadarchive.c | 46 | +++ b/locale/loadarchive.c |
46 | @@ -42,7 +42,7 @@ | 47 | @@ -42,7 +42,7 @@ |
47 | 48 | ||
48 | 49 | ||
@@ -52,11 +53,11 @@ Index: git/locale/loadarchive.c | |||
52 | 53 | ||
53 | /* Size of initial mapping window, optimal if large enough to | 54 | /* Size of initial mapping window, optimal if large enough to |
54 | cover the header plus the initial locale. */ | 55 | cover the header plus the initial locale. */ |
55 | Index: git/locale/localeinfo.h | 56 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h |
56 | =================================================================== | 57 | index 1bfe22aa7f..fdc283c69a 100644 |
57 | --- git.orig/locale/localeinfo.h | 58 | --- a/locale/localeinfo.h |
58 | +++ git/locale/localeinfo.h | 59 | +++ b/locale/localeinfo.h |
59 | @@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int categor | 60 | @@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) |
60 | } | 61 | } |
61 | 62 | ||
62 | /* Default search path if no LOCPATH environment variable. */ | 63 | /* Default search path if no LOCPATH environment variable. */ |
@@ -65,11 +66,11 @@ Index: git/locale/localeinfo.h | |||
65 | 66 | ||
66 | /* Load the locale data for CATEGORY from the file specified by *NAME. | 67 | /* Load the locale data for CATEGORY from the file specified by *NAME. |
67 | If *NAME is "", use environment variables as specified by POSIX, and | 68 | If *NAME is "", use environment variables as specified by POSIX, and |
68 | Index: git/locale/programs/locale.c | 69 | diff --git a/locale/programs/locale.c b/locale/programs/locale.c |
69 | =================================================================== | 70 | index e2e309c2a1..61a92cdcd1 100644 |
70 | --- git.orig/locale/programs/locale.c | 71 | --- a/locale/programs/locale.c |
71 | +++ git/locale/programs/locale.c | 72 | +++ b/locale/programs/locale.c |
72 | @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b | 73 | @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b) |
73 | ((const struct nameent *) b)->name); | 74 | ((const struct nameent *) b)->name); |
74 | } | 75 | } |
75 | 76 | ||
@@ -77,7 +78,7 @@ Index: git/locale/programs/locale.c | |||
77 | 78 | ||
78 | static int | 79 | static int |
79 | write_archive_locales (void **all_datap, char *linebuf) | 80 | write_archive_locales (void **all_datap, char *linebuf) |
80 | @@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, | 81 | @@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, char *linebuf) |
81 | int fd, ret = 0; | 82 | int fd, ret = 0; |
82 | uint32_t cnt; | 83 | uint32_t cnt; |
83 | 84 | ||
@@ -86,7 +87,7 @@ Index: git/locale/programs/locale.c | |||
86 | if (fd < 0) | 87 | if (fd < 0) |
87 | return 0; | 88 | return 0; |
88 | 89 | ||
89 | @@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, | 90 | @@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, char *linebuf) |
90 | if (cnt) | 91 | if (cnt) |
91 | putchar_unlocked ('\n'); | 92 | putchar_unlocked ('\n'); |
92 | 93 | ||
@@ -97,3 +98,6 @@ Index: git/locale/programs/locale.c | |||
97 | 98 | ||
98 | locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); | 99 | locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); |
99 | 100 | ||
101 | -- | ||
102 | 2.27.0 | ||
103 | |||