From: Stefan Liebler <stli@linux.vnet.ibm.com>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH 01/14] S390: Get rid of make warning: overriding recipe for target gconv-modules.
Date: Thu, 28 Apr 2016 06:55:00 -0000 [thread overview]
Message-ID: <nfsbqo$ims$2@ger.gmane.org> (raw)
In-Reply-To: <nfaplc$1bi$12@ger.gmane.org>
Ping
On 04/21/2016 04:55 PM, Stefan Liebler wrote:
> Ping. Is the new handling of gconv-modules in iconvdata/Makefile okay to
> commit?
>
> On 04/14/2016 04:16 PM, Stefan Liebler wrote:
>> Ping. Is the new handling of gconv-modules in iconvdata/Makefile okay to
>> commit?
>>
>> On 02/23/2016 10:21 AM, Stefan Liebler wrote:
>>> This patch introduces a way to provide an architecture dependent
>>> gconv-modules
>>> file. Before this patch, the gconv-modules file was normally installed
>>> from
>>> src-dir/iconvdata/gconv-modules. The S390 Makefile had overridden the
>>> installation recipe (with a make warning) in order to install the
>>> gconv-module-s390 file from build-dir.
>>> The iconvdata/Makefile provides another recipe, which copies the
>>> gconv-modules
>>> file from src to build dir, which are used by the testcases.
>>> Thus the testcases does not use the currently build s390-modules.
>>>
>>> This patch uses build-dir/iconvdata/gconv-modules for installation.
>>> If makefile variable GCONV_MODULES is not defined, then gconv-modules
>>> file
>>> is copied form source to build directory.
>>> If an architecture wants to create his own gconv-modules file, then
>>> the variable
>>> GCONV_MODULE is set to the name of the architecture-dependent
>>> gconv-modules file
>>> in build-directory, which has to be created by a recipe in
>>> sysdeps/.../Makefile.
>>> Then the iconvdata/Makefile copies this file to
>>> build-dir/iconvdata/gconv-modules, which will be used for installation
>>> and test.
>>>
>>> This way, the s390-Makefile does not need to override the recipe for
>>> gconv-modules and no warning is emitted anymore.
>>>
>>> ChangeLog:
>>>
>>> * iconvdata/Makefile (GCONV_MODULES): New variable, which can
>>> be set by sysdeps Makefile.
>>> ($(inst_gconvdir)/gconv-modules):
>>> Install file from $(objpfx)gconv-modules.
>>> ($(objpfx)gconv-modules): Copy File from src-dir or from
>>> build-dir with file-name specified by GCONV_MODULES.
>>> * sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules):
>>> Deleted.
>>> (GCONV_MODULES): New variable.
>>> ---
>>> iconvdata/Makefile | 15 +++++++++++++--
>>> sysdeps/s390/s390-64/Makefile | 17 ++---------------
>>> 2 files changed, 15 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/iconvdata/Makefile b/iconvdata/Makefile
>>> index 357530b..1ac1a5c 100644
>>> --- a/iconvdata/Makefile
>>> +++ b/iconvdata/Makefile
>>> @@ -244,7 +244,7 @@ headers: $(addprefix $(objpfx),
>>> $(generated-modules:=.h))
>>> $(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
>>> @@ -332,6 +332,17 @@ tst-tables-clean:
>>> -rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible
>>>
>>> ifdef objpfx
>>> +# Override GCONV_MODULES file name and provide a Makefile recipe,
>>> +# if you want to create your own version.
>>> +ifndef GCONV_MODULES
>>> +# Copy gconv-modules from src-tree for tests and installation.
>>> $(objpfx)gconv-modules: gconv-modules
>>> - cp $^ $@
>>> + cp $< $@
>>> +else
>>> +generated += $(GCONV_MODULES)
>>> +
>>> +# Copy overrided GCONV_MODULES file to gconv-modules for tests and
>>> installation.
>>> +$(objpfx)gconv-modules: $(objpfx)$(GCONV_MODULES)
>>> + cp $< $@
>>> +endif
>>> endif
>>> diff --git a/sysdeps/s390/s390-64/Makefile
>>> b/sysdeps/s390/s390-64/Makefile
>>> index ce4f0c5..de249a7 100644
>>> --- a/sysdeps/s390/s390-64/Makefile
>>> +++ b/sysdeps/s390/s390-64/Makefile
>>> @@ -39,7 +39,7 @@ $(patsubst %, $(inst_gconvdir)/%.so,
>>> $(s390x-iconv-modules)) : \
>>> $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
>>> $(do-install-program)
>>>
>>> -$(objpfx)gconv-modules-s390: gconv-modules $(+force)
>>> +$(objpfx)gconv-modules-s390: gconv-modules
>>> cp $< $@
>>> echo >> $@
>>> echo "# S/390 hardware accelerated modules" >> $@
>>> @@ -74,19 +74,6 @@ $(objpfx)gconv-modules-s390: gconv-modules $(+force)
>>> 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 \
>>> - $(rtld-prefix) \
>>> - $(common-objpfx)iconv/iconvconfig \
>>> - $(addprefix --prefix=,$(install_root)); \
>>> - fi
>>> -else
>>> - @echo '*@*@*@ You should recreate
>>> $(inst_gconvdir)/gconv-modules.cache'
>>> -endif
>>> +GCONV_MODULES = gconv-modules-s390
>>>
>>> endif
>>>
>>
>>
>
>
next prev parent reply other threads:[~2016-04-28 6:55 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 9:22 [PATCH 00/14] S390: Optimize iconv modules Stefan Liebler
2016-02-23 9:21 ` [PATCH 01/14] S390: Get rid of make warning: overriding recipe for target gconv-modules Stefan Liebler
2016-04-14 14:16 ` Stefan Liebler
2016-04-21 15:00 ` Stefan Liebler
2016-04-28 6:55 ` Stefan Liebler [this message]
2016-05-04 13:15 ` [PING] " Stefan Liebler
2016-05-04 13:40 ` Andreas Schwab
2016-05-09 14:33 ` Stefan Liebler
2016-05-18 15:28 ` Stefan Liebler
2016-05-24 15:02 ` Stefan Liebler
2016-05-25 15:29 ` [COMMITTED] " Stefan Liebler
2016-05-25 15:37 ` Joseph Myers
2016-05-25 15:58 ` Stefan Liebler
2016-05-25 16:32 ` Joseph Myers
2016-02-23 9:21 ` [PATCH 02/14] S390: Mention s390-specific gconv-modues before common ones Stefan Liebler
2016-04-15 10:27 ` Florian Weimer
2016-04-21 14:50 ` Stefan Liebler
2016-02-23 9:21 ` [PATCH 13/14] Fix ucs4le_internal_loop in error case Stefan Liebler
2016-02-23 17:42 ` Joseph Myers
2016-02-25 9:00 ` Stefan Liebler
2016-03-18 13:04 ` Stefan Liebler
2016-03-31 9:20 ` Stefan Liebler
2016-03-31 9:45 ` Andreas Schwab
2016-02-23 9:22 ` [PATCH 06/14] S390: Optimize iso-8859-1 to ibm037 iconv-module Stefan Liebler
2016-04-21 15:05 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 11/14] S390: Fix utf32 to utf8 handling of low surrogates (disable cu41) Stefan Liebler
2016-04-21 15:25 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 03/14] S390: Configure check for vector support in gcc Stefan Liebler
2016-02-23 9:22 ` [PATCH 05/14] S390: Optimize builtin iconv-modules Stefan Liebler
2016-03-18 12:58 ` Stefan Liebler
2016-04-21 14:51 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 04/14] S390: Optimize 8bit-generic iconv modules Stefan Liebler
2016-04-15 13:05 ` Florian Weimer
2016-04-21 15:35 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 08/14] S390: Optimize utf8-utf16 module Stefan Liebler
2016-04-21 15:20 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 12/14] S390: Fix utf32 to utf16 handling of low surrogates (disable cu42) Stefan Liebler
2016-04-21 15:30 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 09/14] S390: Optimize utf16-utf32 module Stefan Liebler
2016-04-21 14:55 ` Stefan Liebler
2016-02-23 9:22 ` [PATCH 07/14] S390: Optimize utf8-utf32 module Stefan Liebler
2016-04-21 15:15 ` Stefan Liebler
2016-02-23 9:23 ` [PATCH 10/14] S390: Use s390-64 specific ionv-modules on s390-32, too Stefan Liebler
2016-02-23 12:06 ` Stefan Liebler
2016-04-21 15:10 ` Stefan Liebler
2016-02-23 9:23 ` [PATCH 14/14] Fix UTF-16 surrogate handling Stefan Liebler
2016-02-23 17:57 ` Joseph Myers
2016-02-25 12:57 ` Stefan Liebler
2016-03-18 13:05 ` Stefan Liebler
2016-03-22 14:39 ` Stefan Liebler
2016-03-31 9:18 ` Stefan Liebler
2016-04-07 14:35 ` Stefan Liebler
2016-04-07 15:18 ` Andreas Schwab
2016-03-01 15:01 ` [PATCH 00/14] S390: Optimize iconv modules Stefan Liebler
2016-03-08 12:33 ` Stefan Liebler
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='nfsbqo$ims$2@ger.gmane.org' \
--to=stli@linux.vnet.ibm.com \
--cc=libc-alpha@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).