diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch index 8bdd466806..e17f6aa3b9 100644 --- a/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch +++ b/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 5a6f019ded549faaf42478f6f96428dc7c20606e Mon Sep 17 00:00:00 2001 | 1 | From 865651d2496a90f7ae8e7cc19a2e54b6f17a8ad5 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:42:06 -0700 | 3 | Date: Fri, 3 Aug 2018 09:42:06 -0700 |
4 | Subject: [PATCH 29/30] localedef --add-to-archive uses a hard-coded locale | 4 | Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path |
5 | path | ||
6 | 5 | ||
7 | it doesn't exist in normal use, and there's no way to pass an | 6 | it doesn't exist in normal use, and there's no way to pass an |
8 | alternative filename. | 7 | alternative filename. |
@@ -15,14 +14,14 @@ Upstream-Status: Inappropriate (OE-specific) | |||
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 14 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | --- | 16 | --- |
18 | locale/programs/locarchive.c | 13 ++++++++----- | 17 | locale/programs/locarchive.c | 37 ++++++++++++++++++++++++++---------- |
19 | 1 file changed, 8 insertions(+), 5 deletions(-) | 18 | 1 file changed, 27 insertions(+), 10 deletions(-) |
20 | 19 | ||
21 | Index: git/locale/programs/locarchive.c | 20 | diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c |
22 | =================================================================== | 21 | index ca332a345f..91f62da662 100644 |
23 | --- git.orig/locale/programs/locarchive.c | 22 | --- a/locale/programs/locarchive.c |
24 | +++ git/locale/programs/locarchive.c | 23 | +++ b/locale/programs/locarchive.c |
25 | @@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, | 24 | @@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) |
26 | struct namehashent *oldnamehashtab; | 25 | struct namehashent *oldnamehashtab; |
27 | struct locarhandle new_ah; | 26 | struct locarhandle new_ah; |
28 | size_t prefix_len = output_prefix ? strlen (output_prefix) : 0; | 27 | size_t prefix_len = output_prefix ? strlen (output_prefix) : 0; |
@@ -52,7 +51,7 @@ Index: git/locale/programs/locarchive.c | |||
52 | strcpy (stpcpy (fname, archivefname), ".XXXXXX"); | 51 | strcpy (stpcpy (fname, archivefname), ".XXXXXX"); |
53 | 52 | ||
54 | /* Not all of the old file has to be mapped. Change this now this | 53 | /* Not all of the old file has to be mapped. Change this now this |
55 | @@ -551,6 +563,8 @@ enlarge_archive (struct locarhandle *ah, | 54 | @@ -551,6 +563,8 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) |
56 | 55 | ||
57 | /* Add the information for the new one. */ | 56 | /* Add the information for the new one. */ |
58 | *ah = new_ah; | 57 | *ah = new_ah; |
@@ -61,7 +60,7 @@ Index: git/locale/programs/locarchive.c | |||
61 | } | 60 | } |
62 | 61 | ||
63 | 62 | ||
64 | @@ -569,10 +583,13 @@ open_archive (struct locarhandle *ah, bo | 63 | @@ -569,10 +583,13 @@ open_archive (struct locarhandle *ah, bool readonly) |
65 | /* If ah has a non-NULL fname open that otherwise open the default. */ | 64 | /* If ah has a non-NULL fname open that otherwise open the default. */ |
66 | if (archivefname == NULL) | 65 | if (archivefname == NULL) |
67 | { | 66 | { |
@@ -79,7 +78,7 @@ Index: git/locale/programs/locarchive.c | |||
79 | } | 78 | } |
80 | 79 | ||
81 | while (1) | 80 | while (1) |
82 | @@ -585,7 +602,7 @@ open_archive (struct locarhandle *ah, bo | 81 | @@ -585,7 +602,7 @@ open_archive (struct locarhandle *ah, bool readonly) |
83 | the default locale archive we ignore the failure and | 82 | the default locale archive we ignore the failure and |
84 | list an empty archive, otherwise we print an error | 83 | list an empty archive, otherwise we print an error |
85 | and exit. */ | 84 | and exit. */ |