mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 20:21:07 +00:00
02eec68167
From localedef --help:
Output control:
...
--no-warnings=<warnings> Comma-separated list of warnings to disable;
supported warnings are: ascii, intcurrsym
...
--warnings=<warnings> Comma-separated list of warnings to enable;
supported warnings are: ascii, intcurrsym
Locales using SHIFT_JIS and SHIFT_JISX0213 character maps are not ASCII
compatible. In order to build locales using these character maps, and
have localedef exit with a status of 0, we add new option to localedef
to disable or enable specific warnings. The options are --no-warnings
and --warnings, to disable and enable specific warnings respectively.
The options take a comma-separated list of warning names. The warning
names are taken directly from the generated warning. When a warning
that can be disabled is issued it will print something like this: foo is
not defined [--no-warnings=foo]
For the initial implementation we add two controllable warnings; first
'ascii' which is used by the localedata installation makefile target to
install SHIFT_JIS and SHIFT_JISX0213-using locales without error; second
'intcurrsym' which allows a program to use a non-standard international
currency symbol without triggering a warning. The 'intcurrsym' is
useful in the future if country codes are added that are not in our
current ISO 4217 list, and the user wants to avoid the warning. Having
at least two warnings to control gives an example for how the changes
can be extended to more warnings if required in the future.
These changes allow ja_JP.SHIFT_JIS and ja_JP.SHIFT_JISX0213 to be
compiled without warnings using --no-warnings=ascii. The
localedata/Makefile $(INSTALL-SUPPORTED-LOCALES) target is adjusted to
automatically add `--no-warnings=ascii` for such charmaps, and likewise
localedata/gen-locale.sh is adjusted with similar logic.
v2: Bring verbose, be_quiet, and all warning control booleans into
record-status.c, and compile this object file to be used by locale,
iconv, and localedef. Any users include record-status.h.
v3: Fix an instance of boolean coercion in set_warning().
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
95 lines
3.2 KiB
Makefile
95 lines
3.2 KiB
Makefile
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for iconv.
|
|
#
|
|
subdir := iconv
|
|
|
|
include ../Makeconfig
|
|
|
|
headers = iconv.h gconv.h
|
|
routines = iconv_open iconv iconv_close \
|
|
gconv_open gconv gconv_close gconv_db gconv_conf \
|
|
gconv_builtin gconv_simple gconv_trans gconv_cache
|
|
routines += gconv_dl
|
|
|
|
vpath %.c ../locale/programs ../intl
|
|
|
|
iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \
|
|
dummy-repertoire simple-hash xstrdup xmalloc \
|
|
record-status
|
|
iconvconfig-modules = strtab xmalloc hash-string
|
|
extra-objs = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o)
|
|
CFLAGS-iconv_prog.c = -I../locale/programs
|
|
CFLAGS-iconv_charmap.c = -I../locale/programs
|
|
CFLAGS-dummy-repertoire.c = -I../locale/programs
|
|
CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
-DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER
|
|
CFLAGS-linereader.c = -DNO_TRANSLITERATION
|
|
CFLAGS-simple-hash.c = -I../locale
|
|
|
|
tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6
|
|
|
|
others = iconv_prog iconvconfig
|
|
install-others-programs = $(inst_bindir)/iconv
|
|
install-sbin = iconvconfig
|
|
|
|
CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
|
|
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
|
|
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
|
|
|
|
# Set libof-* for each routine.
|
|
cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules)
|
|
lib := iconvprogs
|
|
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
xtests-special += $(objpfx)test-iconvconfig.out
|
|
endif
|
|
|
|
# Make a copy of the file because gconv module names are constructed
|
|
# relative to the path of the configuration file.
|
|
$(objpfx)gconv-modules: test-gconv-modules
|
|
cp $< $@
|
|
|
|
ifeq (yes,$(build-shared))
|
|
tests += tst-gconv-init-failure
|
|
modules-names += tst-gconv-init-failure-mod
|
|
modules-names-tests += tst-gconv-init-failure-mod
|
|
$(objpfx)tst-gconv-init-failure-mod.so: $(libsupport)
|
|
$(objpfx)tst-gconv-init-failure.out: \
|
|
$(objpfx)gconv-modules $(objpfx)tst-gconv-init-failure-mod.so
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
$(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
|
|
$(do-install-program)
|
|
|
|
$(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
|
|
$(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
|
|
|
|
$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig
|
|
(set -e; \
|
|
tmp=$(objpfx)gconv-modules.cache.$$$$; \
|
|
rm -f $$tmp; \
|
|
$(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \
|
|
cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \
|
|
rm -f $$tmp) > $@; \
|
|
$(evaluate-test)
|