138 lines
5.8 KiB
Diff
138 lines
5.8 KiB
Diff
|
commit 06a1b794073c4d6adbfb2e4b11339985a14d7a00
|
||
|
|
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
||
|
|
Date: Mon Jun 14 11:09:56 2021 +0530
|
||
|
|
|
||
|
|
Reinstate gconv-modules as the default configuration file
|
||
|
|
|
||
|
|
Reinstate gconv-modules as the main file so that the configuration
|
||
|
|
files in gconv-modules.d/ become add-on configuration. With this, the
|
||
|
|
effective user visible change is that GCONV_PATH can now have
|
||
|
|
supplementary configuration in GCONV_PATH/gconv-modules.d/ in addition
|
||
|
|
to the main GCONV_PATH/gconv-modules file.
|
||
|
|
|
||
|
|
# Conflicts:
|
||
|
|
# iconvdata/Makefile
|
||
|
|
|
||
|
|
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
|
||
|
|
index d682a98b5c4a8003..95e5fb8f722a513b 100644
|
||
|
|
--- a/iconvdata/Makefile
|
||
|
|
+++ b/iconvdata/Makefile
|
||
|
|
@@ -136,13 +136,12 @@ charmaps = ../localedata/charmaps
|
||
|
|
extra-modules-left := $(modules)
|
||
|
|
include extra-module.mk
|
||
|
|
|
||
|
|
-gconv-modules = gconv-modules.conf gconv-modules-extra.conf
|
||
|
|
+gconv-modules = gconv-modules gconv-modules.d/gconv-modules-extra.conf
|
||
|
|
modpfx = $(objpfx)gconv-modules.d/
|
||
|
|
|
||
|
|
extra-objs += $(modules.so)
|
||
|
|
install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
|
||
|
|
- $(addprefix $(inst_gconvdir)/gconv-modules.d/, \
|
||
|
|
- $(gconv-modules))
|
||
|
|
+ $(addprefix $(inst_gconvdir)/, $(gconv-modules))
|
||
|
|
|
||
|
|
# We can build the conversion tables for numerous charsets automatically.
|
||
|
|
|
||
|
|
@@ -184,7 +183,7 @@ 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 += $(addprefix gconv-modules.d/,$(gconv-modules))
|
||
|
|
+generated += $(gconv-modules)
|
||
|
|
endif
|
||
|
|
|
||
|
|
# Rules to generate the headers.
|
||
|
|
@@ -252,8 +251,8 @@ headers: $(addprefix $(objpfx), $(generated-modules:=.h))
|
||
|
|
$(addprefix $(inst_gconvdir)/, $(modules.so)): \
|
||
|
|
$(inst_gconvdir)/%: $(objpfx)% $(+force)
|
||
|
|
$(do-install-program)
|
||
|
|
-$(addprefix $(inst_gconvdir)/gconv-modules.d/, $(gconv-modules)): \
|
||
|
|
- $(inst_gconvdir)/gconv-modules.d/%: $(modpfx)% $(+force)
|
||
|
|
+$(addprefix $(inst_gconvdir)/, $(gconv-modules)): \
|
||
|
|
+ $(inst_gconvdir)/%: $(objpfx)% $(+force)
|
||
|
|
$(do-install)
|
||
|
|
ifeq (no,$(cross-compiling))
|
||
|
|
# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
|
||
|
|
@@ -301,30 +300,30 @@ $(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out
|
||
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
|
||
|
|
$(evaluate-test)
|
||
|
|
|
||
|
|
-$(objpfx)bug-iconv1.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv1.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)bug-iconv2.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv2.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
$(objpfx)bug-iconv3: $(libdl)
|
||
|
|
-$(objpfx)bug-iconv3.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv3.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)bug-iconv5.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv5.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)tst-loading.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)tst-loading.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)tst-iconv4.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)tst-iconv4.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)tst-iconv7.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)tst-iconv7.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)bug-iconv10.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv10.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)bug-iconv12.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv12.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
-$(objpfx)bug-iconv14.out: $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+$(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so))
|
||
|
|
|
||
|
|
$(objpfx)iconv-test.out: run-iconv-test.sh \
|
||
|
|
- $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+ $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so)) \
|
||
|
|
$(common-objdir)/iconv/iconv_prog TESTS
|
||
|
|
iconv_modules="$(modules)" \
|
||
|
|
@@ -333,7 +332,7 @@ $(objpfx)iconv-test.out: run-iconv-test.sh \
|
||
|
|
$(evaluate-test)
|
||
|
|
|
||
|
|
$(objpfx)tst-tables.out: tst-tables.sh \
|
||
|
|
- $(addprefix $(modpfx), $(gconv-modules)) \
|
||
|
|
+ $(addprefix $(objpfx), $(gconv-modules)) \
|
||
|
|
$(addprefix $(objpfx),$(modules.so)) \
|
||
|
|
$(objpfx)tst-table-from $(objpfx)tst-table-to
|
||
|
|
$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
|
||
|
|
@@ -351,3 +350,6 @@ $(modpfx):
|
||
|
|
|
||
|
|
$(modpfx)%: % $(modpfx)
|
||
|
|
cp $< $@
|
||
|
|
+
|
||
|
|
+$(objpfx)gconv-modules: gconv-modules
|
||
|
|
+ cp $^ $@
|
||
|
|
diff --git a/iconvdata/gconv-modules.conf b/iconvdata/gconv-modules
|
||
|
|
similarity index 100%
|
||
|
|
rename from iconvdata/gconv-modules.conf
|
||
|
|
rename to iconvdata/gconv-modules
|
||
|
|
diff --git a/localedata/Makefile b/localedata/Makefile
|
||
|
|
index a5ca7a31f43d50c3..14fcc37fed21e740 100644
|
||
|
|
--- a/localedata/Makefile
|
||
|
|
+++ b/localedata/Makefile
|
||
|
|
@@ -179,7 +179,7 @@ install-others := $(addprefix $(inst_i18ndir)/, \
|
||
|
|
$(locales))
|
||
|
|
endif
|
||
|
|
|
||
|
|
-tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf
|
||
|
|
+tests: $(objdir)/iconvdata/gconv-modules
|
||
|
|
|
||
|
|
tests-static += tst-langinfo-newlocale-static tst-langinfo-setlocale-static
|
||
|
|
|
||
|
|
@@ -442,5 +442,5 @@ $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out
|
||
|
|
bug-setlocale1-ENV-only = LOCPATH=$(objpfx) LC_CTYPE=de_DE.UTF-8
|
||
|
|
bug-setlocale1-static-ENV-only = $(bug-setlocale1-ENV-only)
|
||
|
|
|
||
|
|
-$(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf:
|
||
|
|
+$(objdir)/iconvdata/gconv-modules:
|
||
|
|
$(MAKE) -C ../iconvdata subdir=iconvdata $@
|