diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-02-04 21:41:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-05 12:00:54 +0000 |
commit | 7b8df042d0c175388d6230f008b1c83d5c5cd5da (patch) | |
tree | effa543d93952e198887369a11b9667d94599349 /meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch | |
parent | 77d9b5f02aec991540926fe144076e122c17f64d (diff) | |
download | poky-7b8df042d0c175388d6230f008b1c83d5c5cd5da.tar.gz |
glibc: Upgrade to 2.33
Drop backported patches
(From OE-Core rev: aa87638cf4f2bef66df92f961c7814f6b482fd3d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 15 |
1 files changed, 6 insertions, 9 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 729ce1b42d..14697567c2 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 9a8bf11ea375a2fe5eddb30bc10943e64d3b96a4 Mon Sep 17 00:00:00 2001 | 1 | From 732d4f4954fe60718870048d0583a20a7a8a8540 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 07/29] nativesdk-glibc: Make relocatable install for locales | 4 | Subject: [PATCH] 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 |
@@ -19,7 +19,7 @@ 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 9cd3b71a6d..84272310e0 100644 | 22 | index ab09122b0c..f42cc75780 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 | @@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = |
@@ -41,7 +41,7 @@ index 9cd3b71a6d..84272310e0 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 ba0fe45648..9737fd4cda 100644 | 44 | index 4177fc8972..40247b1e68 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,7 +54,7 @@ index ba0fe45648..9737fd4cda 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 1bfe22aa7f..fdc283c69a 100644 | 57 | index b3d4da0185..22f9dc1140 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 | @@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) |
@@ -67,7 +67,7 @@ index 1bfe22aa7f..fdc283c69a 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 e2e309c2a1..61a92cdcd1 100644 | 70 | index 575b208e82..5ec630c3a4 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 | @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b) |
@@ -98,6 +98,3 @@ index e2e309c2a1..61a92cdcd1 100644 | |||
98 | 98 | ||
99 | locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); | 99 | locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); |
100 | 100 | ||
101 | -- | ||
102 | 2.27.0 | ||
103 | |||