From 5bf7fda437a10cc10cbd1be1bd06b374a581f0dd Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 13 Jun 2011 20:05:58 +0200 Subject: [PATCH] locale-zh: Reject zh_CN.GB18030 locale on Solaris 8. * m4/locale-zh.m4 (gt_LOCALE_ZH_CN): On Solaris 8, set LOCALE_ZH_CN to 'none'. --- ChangeLog | 6 ++++++ m4/locale-zh.m4 | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 571df81c5..7667ceaae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-13 Bruno Haible + + locale-zh: Reject zh_CN.GB18030 locale on Solaris 8. + * m4/locale-zh.m4 (gt_LOCALE_ZH_CN): On Solaris 8, set LOCALE_ZH_CN to + 'none'. + 2011-06-13 Paul Eggert ftoastr: use strtof only if HAVE_STRTOF diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index e03f91f06..5e0639880 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,4 +1,4 @@ -# locale-zh.m4 serial 8 +# locale-zh.m4 serial 9 dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -93,6 +93,12 @@ changequote([,])dnl gt_cv_locale_zh_CN=none fi ;; + solaris2.8) + # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are + # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK. + # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core. + gt_cv_locale_zh_CN=none + ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the -- 2.11.0