-# Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 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
# 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, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
#
# Makefile for iconv data and code.
#
subdir := iconvdata
+include ../Makeconfig
+
# Names of all the shared objects which implement the transformations.
modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \
ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16 \
- T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 EBCDIC-AT-DE \
+ T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE \
EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC \
BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO \
EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \
EBCDIC-FI-SE-A EBCDIC-FR EBCDIC-IS-FRISS EBCDIC-IT EBCDIC-PT \
EBCDIC-UK EBCDIC-US IBM037 IBM038 IBM274 IBM275 IBM423 \
IBM500 IBM870 IBM871 IBM891 IBM903 IBM904 IBM905 IBM1047 \
- IBM874 CP737 CP775 ISO-2022-KR \
+ IBM874 CP737 CP775 ISO-2022-KR HP-TURKISH8 HP-THAI8 HP-GREEK8 \
KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278 \
IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424 \
- IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861 \
- IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880 \
- IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943 \
+ IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM858 IBM860 \
+ IBM861 IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 \
+ IBM880 IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943 \
IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046 \
IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164 \
IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253 \
GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T \
GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8 \
TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213 \
- ISO-2022-JP-3 TSCII IBM866NAV
+ ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048 \
+ IBM1025 IBM1122 IBM1137 IBM1153 IBM1154 IBM1155 IBM1156 \
+ IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008 \
+ IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141 \
+ IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 \
+ IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \
+ IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804 \
+ IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF \
+ MAC-CENTRALEUROPE KOI8-RU ISO8859-9E \
+ CP770 CP771 CP772 CP773 CP774
+
+# If lazy binding is disabled, use BIND_NOW for the gconv modules.
+ifeq ($(bind-now),yes)
+LDFLAGS.so += -Wl,-z,now
+endif
modules.so := $(addsuffix .so, $(modules))
-include ../Makeconfig
-
ifeq (yes,$(build-shared))
-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv3
+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
+ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
+ bug-iconv10 bug-iconv11 bug-iconv12 bug-iconv14
+ifeq ($(have-thread-library),yes)
+tests += bug-iconv3
+endif
test-srcs := tst-table-from tst-table-to
endif
-# No code here is in libc.so.
-CPPFLAGS += -DNOT_IN_libc
-
libJIS-routines := jis0201 jis0208 jis0212
libKSC-routines := ksc5601
libGB-routines := gb2312
$(objpfx)UHC.so: $(objpfx)libKSC.so
LDFLAGS-EUC-JP.so = $(LDFLAGS-rpath-ORIGIN)
$(objpfx)EUC-JP.so: $(objpfx)libJIS.so
+LDFLAGS-EUC-JP-MS.so = $(LDFLAGS-rpath-ORIGIN)
+$(objpfx)EUC-JP-MS.so: $(objpfx)libJIS.so
LDFLAGS-EUC-CN.so = $(LDFLAGS-rpath-ORIGIN)
$(objpfx)EUC-CN.so: $(objpfx)libGB.so
LDFLAGS-EUC-TW.so = $(LDFLAGS-rpath-ORIGIN)
LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
LDFLAGS-libJISX0213.so = $(LDFLAGS-soname-fname)
-distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \
- gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh \
- TESTS $(filter-out testdata/CVS%, $(wildcard testdata/*)) \
- TESTS2 run-iconv-test.sh tst-tables.sh tst-table.sh \
- tst-table-charmap.sh tst-table-from.c tst-table-to.c \
- EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
- EUC-KR.irreversible BIG5HKSCS.irreversible BIG5.irreversible \
- CP1255.irreversible CP1258.irreversible EUC-TW.irreversible \
- IBM856.irreversible IBM922.irreversible IBM1132.irreversible \
- IBM1133.irreversible IBM1160.irreversible IBM1161.irreversible\
- IBM1163.irreversible IBM1164.irreversible \
- ARMSCII-8.irreversible TCVN5712-1.precomposed \
- JISX0213.TXT EUC-JISX0213.precomposed \
- SHIFT_JISX0213.precomposed SHIFT_JISX0213.irreversible \
- TSCII.irreversible TSCII.precomposed \
- 8bit-generic.c 8bit-gap.c \
- ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h \
- cp775.c cp775.h ibm874.c cns11643.c cns11643.h \
- cns11643l1.c cns11643l1.h cp1125.c cp1250.c cp1251.c cp1252.c \
- cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c \
- csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c \
- ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c \
- ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c \
- ebcdic-fi-se-a.c ebcdic-is-friss.c ebcdic-it.c ebcdic-pt.c \
- ebcdic-uk.c ebcdic-us.c ecma-cyrillic.c euc-cn.c euc-jp.c \
- euc-kr.c euc-tw.c gb2312.c gb2312.h gbk.c gost_19768-74.c \
- greek-ccitt.c greek7.c greek7-old.c hp-roman8.c ibm037.c \
- ibm038.c ibm256.c ibm273.c ibm274.c ibm275.c ibm277.c \
- ibm278.c ibm280.c ibm281.c ibm284.c ibm285.c ibm290.c \
- ibm297.c ibm420.c ibm423.c ibm424.c ibm437.c ibm500.c \
- ibm850.c ibm851.c ibm852.c ibm855.c ibm857.c ibm860.c \
- ibm861.c ibm862.c ibm863.c ibm864.c ibm865.c ibm866.c \
- ibm868.c ibm869.c ibm870.c ibm871.c ibm875.c ibm880.c \
- ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c ibm1004.c \
- ibm856.c ibm930.c ibm933.c ibm935.c ibm937.c ibm939.c ibm1046.c \
- ibm856.h ibm930.h ibm933.h ibm935.h ibm937.h ibm939.h ibm1046.h \
- ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h \
- ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h \
- ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c \
- inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c \
- iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c \
- iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c \
- iso8859-11.c iso8859-13.c iso8859-14.c \
- iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c \
- iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h \
- jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c \
- koi8-r.c ksc5601.c ksc5601.h latin-greek.c latin-greek-1.c \
- macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c \
- t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c \
- isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h \
- iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c \
- iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c \
- ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c \
- koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c \
- mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h \
- ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
- euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c \
- tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c
-
# We build the transformation modules only when we build shared libs.
ifeq (yes,$(build-shared))
# We can build the conversion tables for numerous charsets automatically.
gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
- hp-roman8 ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr \
- ebcdic-dk-no ebcdic-dk-no-a ebcdic-es ebcdic-es-a \
- ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr \
- ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \
+ ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr ebcdic-dk-no \
+ ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a \
+ ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
- ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii
+ ibm891 ibm903 ibm904 ibm905 ibm1047
gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \
ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \
ibm297 ibm420 ibm424 ibm437 ibm850 ibm851 ibm852 \
- ibm855 ibm857 ibm860 ibm861 ibm862 ibm863 ibm864 \
- ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004 \
- ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254 \
- cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
- iso8859-10 macintosh iec_p27-1 asmo_449 \
+ ibm855 ibm857 ibm858 ibm860 ibm861 ibm862 ibm863 \
+ ibm864 ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 \
+ ibm1004 ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 \
+ cp1254 cp1256 cp1257 ibm866 iso8859-5 iso8859-7 \
+ iso8859-8 iso8859-10 macintosh iec_p27-1 asmo_449 \
csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
greek-ccitt greek7 greek7-old inis inis-8 \
inis-cyrillic iso_2033 iso_5427 iso_5427-ext \
iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2 \
iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \
georgian-ps georgian-academy iso-ir-209 mac-sami \
- iso8859-11 ibm866nav
+ iso8859-11 ibm866nav pt154 rk1048 mik brf \
+ mac-centraleurope koi8-ru hp-roman8 hp-roman9 \
+ ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk \
+ iso8859-16 viscii iso8859-9e hp-turkish8 \
+ hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774
+
gen-special-modules := iso8859-7jp
generated-modules := $(gen-8bit-modules) $(gen-8bit-gap-modules) \
$(gen-special-modules)
-generated = $(generated-modules:=.h) $(generated-modules:=.stmp) \
- iconv-test.out iconv-rules tst-loading.mtrace \
- mtrace-tst-loading tst-tables.out iconv-test.xxx
+generated += $(generated-modules:=.h) $(generated-modules:=.stmp) \
+ iconv-test.out iconv-rules tst-loading.mtrace \
+ mtrace-tst-loading.out tst-tables.out iconv-test.xxx
ifdef objpfx
generated += gconv-modules
endif
define generate-8bit-table
$(make-target-directory)
-$(SHELL) ./gen-8bit.sh $< > $(@:stmp=T)
+LC_ALL=C $(SHELL) ./gen-8bit.sh $< > $(@:stmp=T)
$(move-if-change) $(@:stmp=T) $(@:stmp=h)
touch $@
endef
define generate-8bit-gap-table
$(make-target-directory)
-$(SHELL) ./gen-8bit-gap.sh $< > $(@:stmp=T)
+LC_ALL=C $(SHELL) ./gen-8bit-gap.sh $< > $(@:stmp=T)
$(move-if-change) $(@:stmp=T) $(@:stmp=h)
touch $@
endef
# The headers must be generated before the compilation.
-before-compile = $(addprefix $(objpfx),$(generated-modules:=.h))
+before-compile += $(addprefix $(objpfx),$(generated-modules:=.h))
ifndef avoid-generated
$(objpfx)iconv-rules: Makefile
{ echo $(filter-out lib%, $(modules)); \
echo 8bit $(gen-8bit-modules); \
echo 8bit-gap $(gen-8bit-gap-modules); } | \
+ LC_ALL=C \
$(AWK) 'NR == 1 { \
for (i = 1; i <= NF; i++) { \
printf "%s-routines := %s\n", $$i, tolower($$i); \
+ printf "libof-%s := iconvdata\n", tolower($$i); \
printf "%s-map := gconv.map\n", $$i; \
} \
}; \
$(objpfx)iso8859-7jp.stmp: $(charmaps)/ISO-8859-7 gen-8bit-gap-1.sh
$(make-target-directory)
- $(SHELL) ./gen-8bit-gap-1.sh $< > $(@:stmp=T)
+ LC_ALL=C $(SHELL) ./gen-8bit-gap-1.sh $< > $(@:stmp=T)
$(move-if-change) $(@:stmp=T) $(@:stmp=h)
touch $@
$(addprefix $(inst_gconvdir)/, $(modules.so)): \
$(inst_gconvdir)/%: $(objpfx)% $(+force)
$(do-install-program)
-$(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
+$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules $(+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 LANGUAGE=C \
- $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
+ LC_ALL=C \
+ $(rtld-prefix) \
$(common-objpfx)iconv/iconvconfig \
$(addprefix --prefix=,$(install_root)); \
fi
endif # build-shared = yes
-include ../Rules
-
-ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
ifeq (yes,$(build-shared))
-tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out
+tests-special += $(objpfx)iconv-test.out $(objpfx)tst-tables.out
ifneq (no,$(PERL))
-tests: $(objpfx)mtrace-tst-loading
+tests-special += $(objpfx)mtrace-tst-loading.out
endif
endif
endif
+include ../Rules
+
+ifeq ($(run-built-tests),yes)
+LOCALES := de_DE.UTF-8
+include ../gen-locales.mk
+
+$(objpfx)bug-iconv6.out: $(gen-locales)
+$(objpfx)tst-iconv7.out: $(gen-locales)
+endif
+
+# Set libof-* for each routine.
+cpp-srcs-left := $(modules) $(generated-modules) $(libJIS-routines) \
+ $(libKSC-routines) $(libGB-routines) $(libCNS-routines) \
+ $(libISOIR165-routines) $(libJISX0213-routines)
+lib := iconvdata
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
+
tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
-$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
+$(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
+ $(evaluate-test)
$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
$(objpfx)bug-iconv3: $(libdl)
$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
+$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(common-objdir)/iconv/iconv_prog TESTS
- $(SHELL) -e $< $(common-objdir) > $@
+ iconv_modules="$(modules)" \
+ $(SHELL) $< $(common-objdir) '$(test-wrapper-env)' \
+ '$(run-program-env)' > $@; \
+ $(evaluate-test)
$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(objpfx)tst-table-from $(objpfx)tst-table-to
- $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@
+ $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
+ '$(test-program-prefix)' > $@; \
+ $(evaluate-test)
do-tests-clean common-mostlyclean: tst-tables-clean
tst-tables-clean:
-rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible
-ifdef objpfx
$(objpfx)gconv-modules: gconv-modules
- cp $^ $@
-endif
+ cat $(sysdeps-gconv-modules) $^ > $@