[PING] [PATCH 01/14] S390: Get rid of make warning: overriding recipe for target gconv-modules.

[Stefan Liebler]

On 05/09/2016 04:15 PM, Stefan Liebler wrote:
> On 05/04/2016 03:40 PM, Andreas Schwab wrote:
>> Define a variable sysdep-gconv-modules that can be set by
>> sysdeps/.../Makefile, and use it in iconvdata/Makefile to cat the files
>> together.  Please also fix the rule in sysdeps/s390/s390-64/Makefile to
>> use a temporary file to make the update atomic.  Since we no longer
>> support empty objpfx the conditional test can be removed.
>>
>> Andreas.
>>
>
> Okay. I will remove the objpfx conditional test in iconvdata/Makefile.
>
> I have to add the s390 specific modules before all the other ones in
> <source>/iconvdata/gconv-modules.
> (See my second patch: "S390: Mention s390-specific gconv-modues before
> common ones.")
> Thus simply concatenating would lead to something like that:
> "
> # GNU libc iconv configuration.
> # Copyright (C) 1997-2016 Free Software Foundation, Inc.
> #....
>
> s390-specific modules
>
> # GNU libc iconv configuration.
> # Copyright (C) 1997-2016 Free Software Foundation, Inc.
> #....
>
> common modules
> "
>
> This doesn't look very nice. Or is it okay?
>
> Then I would prefer to create a file
> <source>/sysdeps/s390/gconv-modules-s390 with the module-definitions,
> set the variable sysdep-gconv-modules and omit the rule with "cp, echo,
> echo ..." in sysdeps/s390/s390-64/Makefile at all.
>
> Bye
> Stefan
>
>
Here is an updated patch. It concatenates the s390-specific and the 
common gconv-modules file together. The s390-specific gconv-modules 
files is specified with variable sysdep-gconv-modules in 
sysdeps/s390/s390-64/Makefile.

The second patch "[PATCH 02/14] S390: Mention s390-specific gconv-modues 
before common ones." can be removed since the s390 modules are already 
mentioned before the common ones with this patch.

The patch "[PATCH 10/14] S390: Use s390-64 specific ionv-modules on 
s390-32,too.", which moves the iconvdata contents from 
sysdeps/s390/s390-64/Makefile to sysdeps/s390/Makefile has to be 
adjusted in order to reflect the Makefile-changes.

Okay to commit with these changes?

Bye
Stefan

---
ChangeLog:

	* iconvdata/Makefile ($(inst_gconvdir)/gconv-modules):
	Install file from $(objpfx)gconv-modules.
	($(objpfx)gconv-modules): Concatenate architecture specific file
	in variable sysdeps-gconv-modules and gconv-modules in src dir.
	* sysdeps/s390/gconv-modules: New file.
	* sysdeps/s390/s390-64/Makefile: ($(inst_gconvdir)/gconv-modules):
	Deleted.
	($(objpfx)gconv-modules-s390): Deleted.
	(sysdeps-gconv-modules): New variable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-S390-Get-rid-of-make-warning-overriding-recipe-for-t.patch
Type: text/x-patch
Size: 7958 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20160518/33ba8517/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-S390-Use-s390-64-specific-ionv-modules-on-s390-32-to.patch
Type: text/x-patch
Size: 183813 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20160518/33ba8517/attachment-0001.bin>