diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-06-22 17:17:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-26 18:09:28 +0200 |
| commit | de4f39b761ac86dab8c43193ca9bd985e58de612 (patch) | |
| tree | 30f491727829269e4951fee034332686a604b956 /patches/localedef-glibc-2.27 | |
| parent | 3f3826e607ed48e5bb611182be900205ffd3b029 (diff) | |
| download | ptxdist-de4f39b761ac86dab8c43193ca9bd985e58de612.tar.gz ptxdist-de4f39b761ac86dab8c43193ca9bd985e58de612.tar.xz | |
host-localedef: support older glibc versions
Without this, creating locales may fail with:
-----------------------
target: locales.install
-----------------------
generating "en_US" - this can take some time
[error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category `LC_CTYPE'
[error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category `LC_NUMERIC'
[error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category `LC_TIME'
[error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category `LC_COLLATE'
[...]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/localedef-glibc-2.27')
| -rw-r--r-- | patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch | 30 | ||||
| -rw-r--r-- | patches/localedef-glibc-2.27/series | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch b/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch new file mode 100644 index 000000000..00f10302b --- /dev/null +++ b/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch @@ -0,0 +1,30 @@ +From: Ladislav Michl <ladis@linux-mips.org> +Date: Tue, 26 Jun 2018 18:03:22 +0200 +Subject: [PATCH] Do not fail on unknown LC_IDENTIFICATION.category values + +Up to the glibc commit 900f59f084bf ("localedef: check +LC_IDENTIFICATION.category values") any value for category +keyword was accepted. This patch turns strict checking off +again, allowing older locales to be processed, such as +those comming with OSELAS.Toolchain-2016.06.1. + +Signed-off-by: Ladislav Michl <ladis@linux-mips.org> +--- + locale/programs/ld-identification.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c +index df0257b6c075..aef618c86363 100644 +--- a/locale/programs/ld-identification.c ++++ b/locale/programs/ld-identification.c +@@ -194,8 +194,8 @@ No definition for %s category found"), "LC_IDENTIFICATION"); + matched = true; + + if (matched != true) +- record_error (0, 0, _("\ +-%s: unknown standard `%s' for category `%s'"), ++ fprintf (stderr, "[warning] \ ++%s: not whilelisted standard `%s' for category `%s'\n", + "LC_IDENTIFICATION", + identification->category[num], + category_name[num]); diff --git a/patches/localedef-glibc-2.27/series b/patches/localedef-glibc-2.27/series index 87817682e..78e9f706b 100644 --- a/patches/localedef-glibc-2.27/series +++ b/patches/localedef-glibc-2.27/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-HACK-only-build-and-install-localedef.patch -# 4ba91dd2b3411d801ec0b8b66547f1a6 - git-ptx-patches magic +0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.category-va.patch +# 8447183eee17ded734500847ad5566d5 - git-ptx-patches magic |