mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 01:21:06 +00:00
686554bff6
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.
89 lines
2.9 KiB
Makefile
89 lines
2.9 KiB
Makefile
pic-ccflag = -fpic
|
|
|
|
ifeq ($(subdir),gmon)
|
|
sysdep_routines += s390x-mcount
|
|
endif
|
|
|
|
ifeq ($(subdir),elf)
|
|
CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused
|
|
CFLAGS-dl-load.c += -Wno-unused
|
|
CFLAGS-dl-reloc.c += -Wno-unused
|
|
endif
|
|
|
|
ifeq ($(subdir),iconvdata)
|
|
ISO-8859-1_CP037_Z900-routines := iso-8859-1_cp037_z900
|
|
ISO-8859-1_CP037_Z900-map := gconv.map
|
|
|
|
UTF8_UTF32_Z9-routines := utf8-utf32-z9
|
|
UTF8_UTF32_Z9-map := gconv.map
|
|
|
|
UTF16_UTF32_Z9-routines := utf16-utf32-z9
|
|
UTF16_UTF32_Z9-map := gconv.map
|
|
|
|
UTF8_UTF16_Z9-routines := utf8-utf16-z9
|
|
UTF8_UTF16_Z9-map := gconv.map
|
|
|
|
s390x-iconv-modules = ISO-8859-1_CP037_Z900 UTF8_UTF16_Z9 UTF16_UTF32_Z9 UTF8_UTF32_Z9
|
|
|
|
extra-modules-left += $(s390x-iconv-modules)
|
|
include extra-module.mk
|
|
|
|
extra-objs += $(addsuffix .so, $(s390x-iconv-modules))
|
|
install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
|
|
|
|
$(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \
|
|
$(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
|
|
$(do-install-program)
|
|
|
|
$(objpfx)gconv-modules-s390: gconv-modules $(+force)
|
|
cp $< $@
|
|
echo >> $@
|
|
echo "# S/390 hardware accelerated modules" >> $@
|
|
echo -n "module ISO-8859-1// IBM037// " >> $@
|
|
echo " ISO-8859-1_CP037_Z900 1" >> $@
|
|
echo -n "module IBM037// ISO-8859-1// " >> $@
|
|
echo " ISO-8859-1_CP037_Z900 1" >> $@
|
|
echo -n "module ISO-10646/UTF8/ UTF-32// " >> $@
|
|
echo " UTF8_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-32BE// ISO-10646/UTF8/ " >> $@
|
|
echo " UTF8_UTF32_Z9 1" >> $@
|
|
echo -n "module ISO-10646/UTF8/ UTF-32BE// " >> $@
|
|
echo " UTF8_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-16BE// UTF-32// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-32BE// UTF-16// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module INTERNAL UTF-16// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-32BE// UTF-16BE// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module INTERNAL UTF-16BE// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-16BE// UTF-32BE// " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-16BE// INTERNAL " >> $@
|
|
echo " UTF16_UTF32_Z9 1" >> $@
|
|
echo -n "module UTF-16BE// ISO-10646/UTF8/ " >> $@
|
|
echo " UTF8_UTF16_Z9 1" >> $@
|
|
echo -n "module ISO-10646/UTF8/ UTF-16// " >> $@
|
|
echo " UTF8_UTF16_Z9 1" >> $@
|
|
echo -n "module ISO-10646/UTF8/ UTF-16BE// " >> $@
|
|
echo " UTF8_UTF16_Z9 1" >> $@
|
|
|
|
$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules-s390 $(+force)
|
|
$(do-install)
|
|
ifeq (no,$(cross-compiling))
|
|
# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
|
|
# if this libc has more gconv modules than the previously installed one.
|
|
if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
|
|
LC_ALL=C \
|
|
$(elf-objpfx)ld.so --library-path $(rpath-link) \
|
|
$(common-objpfx)iconv/iconvconfig \
|
|
$(addprefix --prefix=,$(install_root)); \
|
|
fi
|
|
else
|
|
@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
|
|
endif
|
|
|
|
endif
|