From: DJ Delorie <dj@redhat.com>
To: Siddhesh Poyarekar <siddhesh@sourceware.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH 4/5] iconvdata: Move gconv-modules configuration to gconv-modules.conf
Date: Tue, 08 Jun 2021 21:33:15 -0400 [thread overview]
Message-ID: <xn1r9bes9w.fsf@greed.delorie.com> (raw)
In-Reply-To: <20210607085221.43612-5-siddhesh@sourceware.org>
Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org> writes:
> +gconv-modules = gconv-modules.conf
> +modpfx = $(objpfx)gconv-modules.d/
Ok
> install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
> - $(inst_gconvdir)/gconv-modules
> + $(addprefix $(inst_gconvdir)/gconv-modules.d/, \
> + $(gconv-modules))
from .../gconv-modules to .../gconv-modules.d/gconv-modules.conf, ok
> ifdef objpfx
> -generated += gconv-modules
> +generated += $(addprefix gconv-modules.d/,$(gconv-modules))
> endif
Same, ok
> -$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules $(+force)
> +$(addprefix $(inst_gconvdir)/gconv-modules.d/, $(gconv-modules)): \
> + $(inst_gconvdir)/gconv-modules.d/%: $(modpfx)% $(+force)
> $(do-install)
Ok.
> @@ -303,28 +307,29 @@ $(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 \
> +$(objpfx)bug-iconv1.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv2.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv3.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv5.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-loading.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv4.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv7.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv10.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv12.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
> -$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
> +$(objpfx)bug-iconv14.out: $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
Ok.
> -$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
> +$(objpfx)iconv-test.out: run-iconv-test.sh \
> + $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so)) \
> $(common-objdir)/iconv/iconv_prog TESTS
Ok.
> -$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
> +$(objpfx)tst-tables.out: tst-tables.sh \
> + $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so)) \
> $(objpfx)tst-table-from $(objpfx)tst-table-to
> $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
Ok.
> -$(objpfx)gconv-modules: gconv-modules
> - cat $(sysdeps-gconv-modules) $^ > $@
> +$(modpfx):
> + mkdir -p $@
> +
> +$(modpfx)%: % $(modpfx)
> + cp $< $@
Ok.
> # Test requires BIG5HKSCS.
> -$(objpfx)tst-iconv-big5-hkscs-to-2ucs4.out: $(objpfx)gconv-modules \
> +$(objpfx)tst-iconv-big5-hkscs-to-2ucs4.out: \
> + $(addprefix $(modpfx), $(gconv-modules)) \
> $(addprefix $(objpfx),$(modules.so))
Ok.
> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules.conf
> similarity index 100%
> rename from iconvdata/gconv-modules
> rename to iconvdata/gconv-modules.conf
Ok.
> diff --git a/localedata/Makefile b/localedata/Makefile
>
> -tests: $(objdir)/iconvdata/gconv-modules
> +tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf
Ok.
> -$(objdir)/iconvdata/gconv-modules:
> +$(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf:
> $(MAKE) -C ../iconvdata subdir=iconvdata $@
Ok.
> diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
> -install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
> +install-others += $(patsubst %, $(inst_gconvdir)/%.so, \
> + $(s390x-iconv-modules)) \
> + $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf
Ok
> $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \
> $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
> $(do-install-program)
>
> -sysdeps-gconv-modules = ../sysdeps/s390/gconv-modules
> +ifdef objpfx
> +generated += gconv-modules.d/gconv-modules-s390.conf
> +endif
> +
> +$(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \
> + $(modpfx)gconv-modules-s390.conf $(+force)
> + $(do-install)
> +
> +$(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \
> + $(modpfx)
> + cp $< $@
> endif
Ok
> diff --git a/sysdeps/s390/gconv-modules b/sysdeps/s390/gconv-modules-s390.conf
> similarity index 100%
> rename from sysdeps/s390/gconv-modules
> rename to sysdeps/s390/gconv-modules-s390.conf
Ok
Reviewed-by: DJ Delorie <dj@redhat.com>
next prev parent reply other threads:[~2021-06-09 1:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 8:52 [PATCH 0/5] gconv module configuration improvements Siddhesh Poyarekar
2021-06-07 8:52 ` [PATCH 1/5] iconvconfig: Make file handling more general purpose Siddhesh Poyarekar
2021-06-08 20:53 ` DJ Delorie
2021-06-07 8:52 ` [PATCH 2/5] iconvconfig: Read configuration from gconv-modules.d subdirectory Siddhesh Poyarekar
2021-06-07 9:06 ` Andreas Schwab
2021-06-07 9:17 ` Siddhesh Poyarekar
2021-06-08 21:46 ` DJ Delorie
2021-06-07 8:52 ` [PATCH 3/5] gconv_conf: Read configuration files in gconv-modules.d Siddhesh Poyarekar
2021-06-08 23:33 ` DJ Delorie
2021-06-09 2:07 ` DJ Delorie
2021-06-07 8:52 ` [PATCH 4/5] iconvdata: Move gconv-modules configuration to gconv-modules.conf Siddhesh Poyarekar
2021-06-09 1:33 ` DJ Delorie [this message]
2021-06-10 10:23 ` Andreas Schwab
2021-06-10 11:11 ` Siddhesh Poyarekar
2021-06-10 11:24 ` Andreas Schwab
2021-06-10 11:28 ` Siddhesh Poyarekar
2021-06-10 11:58 ` Andreas Schwab
2021-06-07 8:52 ` [PATCH 5/5] iconvdata: Split out non-essential gconv module configuration Siddhesh Poyarekar
2021-06-09 2:00 ` DJ Delorie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xn1r9bes9w.fsf@greed.delorie.com \
--to=dj@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).