summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-08-08 22:43:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-12 19:22:04 +0100
commite08a78c4534543fd49dcadfd9edf3247b344f7a7 (patch)
treeaaf33c7dece2867eb753b4738836dd5ad32646c8 /meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch
parenta0402e7822228241130e79133bca38f9f4a62043 (diff)
downloadpoky-e08a78c4534543fd49dcadfd9edf3247b344f7a7.tar.gz
glibc: Bump to 2.36
(From OE-Core rev: 54f7441135c701b0b1ba337db04aa9a6410b3d3d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> 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.patch12
1 files changed, 6 insertions, 6 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 b40d2bdef6..dc24c0240e 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 @@
1From bf1603b3d73f64de777be00f7e55f2cfef596102 Mon Sep 17 00:00:00 2001 1From ce4e796fa8bd2df962cf7a0e4bc69ab6181e4ebf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:55:12 -0700 3Date: Fri, 3 Aug 2018 09:55:12 -0700
4Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales 4Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales
@@ -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
21diff --git a/locale/findlocale.c b/locale/findlocale.c 21diff --git a/locale/findlocale.c b/locale/findlocale.c
22index 5986373edd..856ba9afc0 100644 22index fc433b61d8..d6f030f13c 100644
23--- a/locale/findlocale.c 23--- a/locale/findlocale.c
24+++ b/locale/findlocale.c 24+++ b/locale/findlocale.c
25@@ -55,7 +55,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = 25@@ -55,7 +55,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
@@ -41,7 +41,7 @@ index 5986373edd..856ba9afc0 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
43diff --git a/locale/loadarchive.c b/locale/loadarchive.c 43diff --git a/locale/loadarchive.c b/locale/loadarchive.c
44index 512769eaec..436619091b 100644 44index fcc4913319..62cae8c6c0 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 512769eaec..436619091b 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. */
56diff --git a/locale/localeinfo.h b/locale/localeinfo.h 56diff --git a/locale/localeinfo.h b/locale/localeinfo.h
57index b3d4da0185..22f9dc1140 100644 57index fd43033a19..3dc26272a0 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,7 +67,7 @@ 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
69diff --git a/locale/programs/locale.c b/locale/programs/locale.c 69diff --git a/locale/programs/locale.c b/locale/programs/locale.c
70index e9275d6b83..a9109155e5 100644 70index 1b51b50d68..87c9049444 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@@ -631,6 +631,7 @@ nameentcmp (const void *a, const void *b) 73@@ -631,6 +631,7 @@ nameentcmp (const void *a, const void *b)