diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-06-07 19:58:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-07 19:58:36 +0000 |
| commit | 686554bff63dff0f8b20c84e9bdca45e643f9d9c (patch) | |
| tree | 75aafab5cfde6f9fdf80ae3e8c96416886984ac9 /localedata | |
| parent | 68e6b6b1bfa53f884b4184ffef95c6c87e284e68 (diff) | |
| download | glibc-686554bff63dff0f8b20c84e9bdca45e643f9d9c.zip glibc-686554bff63dff0f8b20c84e9bdca45e643f9d9c.tar.gz glibc-686554bff63dff0f8b20c84e9bdca45e643f9d9c.tar.bz2 | |
Remove redundant C locale settings.
Various glibc build / install / test code has C locale settings that
are redundant with LC_ALL=C.
LC_ALL takes precedence over LANG, so anywhere that sets LC_ALL=C
(explicitly, or through it being in the default environment for
running tests) does not need to set LANG=C. LC_ALL=C also takes
precedence over LANGUAGE, since
2001-01-02 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Rewrite so that LANGUAGE
value is ignored if the selected locale is the C locale.
* intl/tst-gettext.c: Set locale for above change.
* intl/tst-translit.c: Likewise.
and so settings of LANGUAGE=C are also redundant when LC_ALL=C is
set. One test also had LC_ALL=C in its -ENV setting, although it's
part of the default environment used for tests.
This patch removes the redundant settings. It removes a suggestion in
install.texi of setting LANGUAGE=C LC_ALL=C for "make install"; the
Makefile.in target "install" already sets LC_ALL_C so there's no need
for the user to set it (and nor should there be any need for the user
to set it).
If some build machine tool used by "make install" uses a version of
libintl predating that 2001 change, and the user has LANGUAGE set, the
removal of LANGUAGE=C from the Makefile.in "install" rule could in
principle affect the user's installation. However, I don't think we
need to be concerned about pre-2001 build tools.
Tested x86_64.
* Makefile (install): Don't set LANGUAGE.
* Makefile.in (install): Likewise.
* assert/Makefile (test-assert-ENV): Remove variable.
(test-assert-perr-ENV): Likewise.
* elf/Makefile (neededtest4-ENV): Likewise.
* iconvdata/Makefile ($(inst_gconvdir)/gconv-modules)
[$(cross-compiling) = no]: Don't set LANGUAGE.
* io/ftwtest-sh (LANG): Remove variable.
* libio/Makefile (tst-widetext-ENV): Likewise.
* manual/install.texi (Running make install): Don't refer to
environment settings for make install.
* INSTALL: Regenerated.
* nptl/tst-tls6.sh: Don't set LANG.
* posix/globtest.sh (LANG): Remove variable.
* string/Makefile (tester-ENV): Likewise.
(inl-tester-ENV): Likewise.
(noinl-tester-ENV): Likewise.
* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules)
[$(cross-compiling) = no]: Don't set LANGUAGE.
* timezone/Makefile (build-testdata): Use $(built-program-cmd)
without explicit environment settings.
localedata/ChangeLog:
* tst-fmon.sh: Don't set LANGUAGE.
* tst-locale.sh: Likewise.
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rwxr-xr-x | localedata/tst-fmon.sh | 2 | ||||
| -rwxr-xr-x | localedata/tst-locale.sh | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 7d91d38..666b6dc 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2014-06-07 Joseph Myers <joseph@codesourcery.com> + + * tst-fmon.sh: Don't set LANGUAGE. + * tst-locale.sh: Likewise. + 2014-06-06 Joseph Myers <joseph@codesourcery.com> * Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))): Use diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index 7f1b248..275428e 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -37,7 +37,7 @@ for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do fn=charmaps/ISO-8859-1 ${run_program_prefix_before_env} \ ${run_program_env} \ - I18NPATH=. LANGUAGE=C \ + I18NPATH=. \ ${run_program_prefix_after_env} ${common_objpfx}locale/localedef \ --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns done diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh index 7c71dcf..7942a69 100755 --- a/localedata/tst-locale.sh +++ b/localedata/tst-locale.sh @@ -36,7 +36,7 @@ test_locale () fi ${localedef_before_env} \ ${run_program_env} \ - I18NPATH=. LANGUAGE=C \ + I18NPATH=. \ ${localedef_after_env} --quiet -c -f $charmap -i $input \ ${rep} ${common_objpfx}localedata/$out |