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 | 22 |
1 files changed, 11 insertions, 11 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 14697567c2..54c085a714 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,4 +1,4 @@ | |||
1 | From 732d4f4954fe60718870048d0583a20a7a8a8540 Mon Sep 17 00:00:00 2001 | 1 | From 296bdde0683aa55cdea0fd0cab05ff8fbc462b17 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] nativesdk-glibc: Make relocatable install for locales |
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 4 files changed, 8 insertions(+), 7 deletions(-) | 19 | 4 files changed, 8 insertions(+), 7 deletions(-) |
20 | 20 | ||
21 | diff --git a/locale/findlocale.c b/locale/findlocale.c | 21 | diff --git a/locale/findlocale.c b/locale/findlocale.c |
22 | index ab09122b0c..f42cc75780 100644 | 22 | index 8d6e4e33e3..bfe74f241d 100644 |
23 | --- a/locale/findlocale.c | 23 | --- a/locale/findlocale.c |
24 | +++ b/locale/findlocale.c | 24 | +++ b/locale/findlocale.c |
25 | @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = | 25 | @@ -55,7 +55,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = |
26 | which are somehow addressed. */ | 26 | which are somehow addressed. */ |
27 | struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; | 27 | struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; |
28 | 28 | ||
@@ -31,7 +31,7 @@ index ab09122b0c..f42cc75780 100644 | |||
31 | 31 | ||
32 | /* 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 |
33 | empty. */ | 33 | empty. */ |
34 | @@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, | 34 | @@ -165,7 +165,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, |
35 | 35 | ||
36 | /* Nothing in the archive. Set the default path to search below. */ | 36 | /* Nothing in the archive. Set the default path to search below. */ |
37 | locale_path = _nl_default_locale_path; | 37 | locale_path = _nl_default_locale_path; |
@@ -41,7 +41,7 @@ index ab09122b0c..f42cc75780 100644 | |||
41 | else | 41 | else |
42 | /* 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 |
43 | diff --git a/locale/loadarchive.c b/locale/loadarchive.c | 43 | diff --git a/locale/loadarchive.c b/locale/loadarchive.c |
44 | index 4177fc8972..40247b1e68 100644 | 44 | index 452e3eb6e3..c7467aec42 100644 |
45 | --- a/locale/loadarchive.c | 45 | --- a/locale/loadarchive.c |
46 | +++ b/locale/loadarchive.c | 46 | +++ b/locale/loadarchive.c |
47 | @@ -42,7 +42,7 @@ | 47 | @@ -42,7 +42,7 @@ |
@@ -54,10 +54,10 @@ index 4177fc8972..40247b1e68 100644 | |||
54 | /* Size of initial mapping window, optimal if large enough to | 54 | /* Size of initial mapping window, optimal if large enough to |
55 | cover the header plus the initial locale. */ | 55 | cover the header plus the initial locale. */ |
56 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h | 56 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h |
57 | index b3d4da0185..22f9dc1140 100644 | 57 | index ed698faef1..f7efc288a5 100644 |
58 | --- a/locale/localeinfo.h | 58 | --- a/locale/localeinfo.h |
59 | +++ b/locale/localeinfo.h | 59 | +++ b/locale/localeinfo.h |
60 | @@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) | 60 | @@ -347,7 +347,7 @@ _nl_lookup_word (locale_t l, int category, int item) |
61 | } | 61 | } |
62 | 62 | ||
63 | /* Default search path if no LOCPATH environment variable. */ | 63 | /* Default search path if no LOCPATH environment variable. */ |
@@ -67,10 +67,10 @@ index b3d4da0185..22f9dc1140 100644 | |||
67 | /* 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. |
68 | If *NAME is "", use environment variables as specified by POSIX, and | 68 | If *NAME is "", use environment variables as specified by POSIX, and |
69 | diff --git a/locale/programs/locale.c b/locale/programs/locale.c | 69 | diff --git a/locale/programs/locale.c b/locale/programs/locale.c |
70 | index 575b208e82..5ec630c3a4 100644 | 70 | index c7ee1874e8..8281e32236 100644 |
71 | --- a/locale/programs/locale.c | 71 | --- a/locale/programs/locale.c |
72 | +++ b/locale/programs/locale.c | 72 | +++ b/locale/programs/locale.c |
73 | @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b) | 73 | @@ -631,6 +631,7 @@ nameentcmp (const void *a, const void *b) |
74 | ((const struct nameent *) b)->name); | 74 | ((const struct nameent *) b)->name); |
75 | } | 75 | } |
76 | 76 | ||
@@ -78,7 +78,7 @@ index 575b208e82..5ec630c3a4 100644 | |||
78 | 78 | ||
79 | static int | 79 | static int |
80 | write_archive_locales (void **all_datap, char *linebuf) | 80 | write_archive_locales (void **all_datap, char *linebuf) |
81 | @@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, char *linebuf) | 81 | @@ -644,7 +645,7 @@ write_archive_locales (void **all_datap, char *linebuf) |
82 | int fd, ret = 0; | 82 | int fd, ret = 0; |
83 | uint32_t cnt; | 83 | uint32_t cnt; |
84 | 84 | ||
@@ -87,7 +87,7 @@ index 575b208e82..5ec630c3a4 100644 | |||
87 | if (fd < 0) | 87 | if (fd < 0) |
88 | return 0; | 88 | return 0; |
89 | 89 | ||
90 | @@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, char *linebuf) | 90 | @@ -699,8 +700,8 @@ write_archive_locales (void **all_datap, char *linebuf) |
91 | if (cnt) | 91 | if (cnt) |
92 | putchar_unlocked ('\n'); | 92 | putchar_unlocked ('\n'); |
93 | 93 | ||