diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch index 7fe5db0c2a..0b2f020fdd 100644 --- a/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e4b8abdc2d884d721fd89d67b689546f2f780924 Mon Sep 17 00:00:00 2001 | 1 | From 557ed640b26bd208ce8d4a6fd725b124893668d7 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: Wed, 18 Mar 2015 01:33:49 +0000 | 3 | Date: Wed, 18 Mar 2015 01:33:49 +0000 |
4 | Subject: [PATCH 21/29] eglibc: Forward port cross locale generation support | 4 | Subject: [PATCH] eglibc: Forward port cross locale generation support |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | create mode 100644 locale/catnames.c | 23 | create mode 100644 locale/catnames.c |
24 | 24 | ||
25 | diff --git a/locale/Makefile b/locale/Makefile | 25 | diff --git a/locale/Makefile b/locale/Makefile |
26 | index 49c0c78c7d..ebfcf4f4da 100644 | 26 | index b7c60681fa..07c606cde3 100644 |
27 | --- a/locale/Makefile | 27 | --- a/locale/Makefile |
28 | +++ b/locale/Makefile | 28 | +++ b/locale/Makefile |
29 | @@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ | 29 | @@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ |
@@ -89,7 +89,7 @@ index 0000000000..538f3f5edb | |||
89 | + [LC_ALL] = sizeof ("LC_ALL") - 1 | 89 | + [LC_ALL] = sizeof ("LC_ALL") - 1 |
90 | + }; | 90 | + }; |
91 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h | 91 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h |
92 | index fdc283c69a..4eeed35f90 100644 | 92 | index 22f9dc1140..fa31b3c5ea 100644 |
93 | --- a/locale/localeinfo.h | 93 | --- a/locale/localeinfo.h |
94 | +++ b/locale/localeinfo.h | 94 | +++ b/locale/localeinfo.h |
95 | @@ -230,7 +230,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) | 95 | @@ -230,7 +230,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) |
@@ -102,7 +102,7 @@ index fdc283c69a..4eeed35f90 100644 | |||
102 | # define NL_CURRENT_INDIRECT 1 | 102 | # define NL_CURRENT_INDIRECT 1 |
103 | #endif | 103 | #endif |
104 | diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c | 104 | diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c |
105 | index 1a526a240d..0fb2daf936 100644 | 105 | index 4841bfd05d..ffcba1fd79 100644 |
106 | --- a/locale/programs/charmap-dir.c | 106 | --- a/locale/programs/charmap-dir.c |
107 | +++ b/locale/programs/charmap-dir.c | 107 | +++ b/locale/programs/charmap-dir.c |
108 | @@ -18,7 +18,9 @@ | 108 | @@ -18,7 +18,9 @@ |
@@ -148,7 +148,7 @@ index 1a526a240d..0fb2daf936 100644 | |||
148 | return NULL; | 148 | return NULL; |
149 | } | 149 | } |
150 | diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c | 150 | diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c |
151 | index feb1a11258..5a8e522470 100644 | 151 | index 0af21e05e2..4980b0c52f 100644 |
152 | --- a/locale/programs/ld-collate.c | 152 | --- a/locale/programs/ld-collate.c |
153 | +++ b/locale/programs/ld-collate.c | 153 | +++ b/locale/programs/ld-collate.c |
154 | @@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, | 154 | @@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, |
@@ -197,7 +197,7 @@ index feb1a11258..5a8e522470 100644 | |||
197 | == runp->wcnext->wcs[runp->nwcs - 1] + 1)); | 197 | == runp->wcnext->wcs[runp->nwcs - 1] + 1)); |
198 | 198 | ||
199 | diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c | 199 | diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c |
200 | index 3328093d0e..d58fb0f4b7 100644 | 200 | index 2fb579bbbf..d0be99581c 100644 |
201 | --- a/locale/programs/ld-ctype.c | 201 | --- a/locale/programs/ld-ctype.c |
202 | +++ b/locale/programs/ld-ctype.c | 202 | +++ b/locale/programs/ld-ctype.c |
203 | @@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, | 203 | @@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, |
@@ -279,7 +279,7 @@ index 3328093d0e..d58fb0f4b7 100644 | |||
279 | srunp = srunp->next; | 279 | srunp = srunp->next; |
280 | } | 280 | } |
281 | diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c | 281 | diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c |
282 | index f7db873adb..fec3773c9d 100644 | 282 | index dcd2a2386d..6814740325 100644 |
283 | --- a/locale/programs/ld-time.c | 283 | --- a/locale/programs/ld-time.c |
284 | +++ b/locale/programs/ld-time.c | 284 | +++ b/locale/programs/ld-time.c |
285 | @@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME"); | 285 | @@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME"); |
@@ -348,7 +348,7 @@ index f7db873adb..fec3773c9d 100644 | |||
348 | 348 | ||
349 | 349 | ||
350 | diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c | 350 | diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c |
351 | index 7ebd933801..5753750756 100644 | 351 | index 96d3ab66db..3af379d2c3 100644 |
352 | --- a/locale/programs/linereader.c | 352 | --- a/locale/programs/linereader.c |
353 | +++ b/locale/programs/linereader.c | 353 | +++ b/locale/programs/linereader.c |
354 | @@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, | 354 | @@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, |
@@ -361,7 +361,7 @@ index 7ebd933801..5753750756 100644 | |||
361 | size_t bufmax = 56; | 361 | size_t bufmax = 56; |
362 | 362 | ||
363 | diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c | 363 | diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c |
364 | index b048bd05b9..fed15c42ec 100644 | 364 | index 832c8fd1fc..fe689b3ae1 100644 |
365 | --- a/locale/programs/localedef.c | 365 | --- a/locale/programs/localedef.c |
366 | +++ b/locale/programs/localedef.c | 366 | +++ b/locale/programs/localedef.c |
367 | @@ -109,6 +109,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; | 367 | @@ -109,6 +109,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; |
@@ -407,7 +407,7 @@ index b048bd05b9..fed15c42ec 100644 | |||
407 | force_output = 1; | 407 | force_output = 1; |
408 | break; | 408 | break; |
409 | diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c | 409 | diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c |
410 | index eb2f4634da..d387147323 100644 | 410 | index 0f1affa1d4..7d86fae801 100644 |
411 | --- a/locale/programs/locfile.c | 411 | --- a/locale/programs/locfile.c |
412 | +++ b/locale/programs/locfile.c | 412 | +++ b/locale/programs/locfile.c |
413 | @@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, | 413 | @@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, |
@@ -430,7 +430,7 @@ index eb2f4634da..d387147323 100644 | |||
430 | 430 | ||
431 | /* Record that FILE's next element is the 32-bit integer VALUE. */ | 431 | /* Record that FILE's next element is the 32-bit integer VALUE. */ |
432 | diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h | 432 | diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h |
433 | index 7ea10038b4..0888c09762 100644 | 433 | index c986d599ec..222a779176 100644 |
434 | --- a/locale/programs/locfile.h | 434 | --- a/locale/programs/locfile.h |
435 | +++ b/locale/programs/locfile.h | 435 | +++ b/locale/programs/locfile.h |
436 | @@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, | 436 | @@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, |
@@ -519,7 +519,7 @@ index 7ea10038b4..0888c09762 100644 | |||
519 | + | 519 | + |
520 | #endif /* locfile.h */ | 520 | #endif /* locfile.h */ |
521 | diff --git a/locale/setlocale.c b/locale/setlocale.c | 521 | diff --git a/locale/setlocale.c b/locale/setlocale.c |
522 | index 030f1727bd..096d8ed895 100644 | 522 | index 19ed85ae8e..f28ca11446 100644 |
523 | --- a/locale/setlocale.c | 523 | --- a/locale/setlocale.c |
524 | +++ b/locale/setlocale.c | 524 | +++ b/locale/setlocale.c |
525 | @@ -63,35 +63,6 @@ static char *const _nl_current_used[] = | 525 | @@ -63,35 +63,6 @@ static char *const _nl_current_used[] = |
@@ -558,6 +558,3 @@ index 030f1727bd..096d8ed895 100644 | |||
558 | #ifdef NL_CURRENT_INDIRECT | 558 | #ifdef NL_CURRENT_INDIRECT |
559 | # define WEAK_POSTLOAD(postload) weak_extern (postload) | 559 | # define WEAK_POSTLOAD(postload) weak_extern (postload) |
560 | #else | 560 | #else |
561 | -- | ||
562 | 2.27.0 | ||
563 | |||