On Fri, Jun 22, 2018 at 04:15:05PM +0200, Ladislav Michl wrote: > On Fri, Jun 22, 2018 at 09:01:37AM +0200, Michael Olbrich wrote: > > On Tue, Jun 19, 2018 at 03:08:42PM +0000, Baeuerle, Florian wrote: > > > I'm having troubles building a ptxdist Project with ptxdist-2018.06.0 in > > > combination with the OSELAS-Toolchain 2016.06.1. > > > > > > The new hostdef-locale's localedef cannot handle the locales from the > > > old OSELAS-Toolchain: > > > > > > generating "en_US.UTF-8" - this can take some time > > > calling localedef binary failed > > > /usr/local/lib/ptxdist-2018.06.0/rules/locales.make:28: recipe for target > > > '/build/platform-core-am335x/state/locales.install' failed > > > [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' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_MONETARY' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_MESSAGES' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_PAPER' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_NAME' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_ADDRESS' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_TELEPHONE' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_MEASUREMENT' > > > [error] LC_IDENTIFICATION: unknown standard `en_US:2000' for category > > > `LC_IDENTIFICATION' > > > [error] no output file produced because errors were issued > > > make: *** [/build/platform-core-am335x/state/locales.install] Error 1 > > > > > > > > > This is caused by 47116f66f411d4dadfce42c2fdd6d41b351ccfd4. > > > > > > That change probably pulled in this change: > > > > > > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=900f59f084bfe35cb389bbe0dc464413a1a38e90 > > > > Indeed. I think adding "i18n:2000" to the list of standards introduced in > > this commit should help. Can you try that and send a patch if it works? > > No, this won't work as localedef is doing plain strcmp on that string. Adding > "en_US:2000" would help in this particular case and fail again for eg > cs_CZ:2000 (as in /usr/share/i18n/locales/cs_CZ from glibc-2.23) > > I suggest to revert this above patch entirely or at least make checking non > fatal.
...and here is a patch for above suggestion. diff --git a/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.patch b/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.patch new file mode 100644 index 000000000..50de8c7bc --- /dev/null +++ b/patches/localedef-glibc-2.27/0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.patch @@ -0,0 +1,27 @@ +From: Ladislav Michl <[email protected]> +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 <[email protected]> +--- + locale/programs/ld-identification.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/locale/programs/ld-identification.c 2018-06-22 15:58:55.137509301 +0200 ++++ b/locale/programs/ld-identification.c 2018-06-22 16:49:11.282324091 +0200 +@@ -194,8 +194,8 @@ + 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..af8a219fe 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 +0002-Do-not-fail-on-unknown-LC_IDENTIFICATION.patch # 4ba91dd2b3411d801ec0b8b66547f1a6 - git-ptx-patches magic -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
