* [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
@ 2011-02-07 16:34 Simon Baldwin
2011-02-07 17:08 ` Diego Novillo
0 siblings, 1 reply; 5+ messages in thread
From: Simon Baldwin @ 2011-02-07 16:34 UTC (permalink / raw)
To: libstdc++; +Cc: gcc-patches
Make bits/stamp-bits generated by libstc++-v3/include a regular file.
Building stamp-bits-sup in libstdc++-v3/include creates a bits/stamp-bits
file. Because it's generated by 'ln -s stamp-bits .', the file is a
symbolic link that points back to itself. This prevents cpio -L from
copying the built tree ("Too many levels of symbolic links").
This change removes the self-referential bits/stamp-bits and replaces it
with a regular timestamp file, allowing cpio -L to handle it cleanly.
Primarily needed for google/integration. OK?
Secondarily, equally applicable to trunk. OK there also?
libstdc++-v3/ChangeLog:
2011-02-07 Simon Baldwin <simonb@google.com>
* include/Makefile.am: Fix links built for stamp-sup-bits.
* include/Makefile.in: Rebuild.
Index: libstdc++-v3/include/Makefile.am
===================================================================
--- libstdc++-v3/include/Makefile.am (revision 169786)
+++ libstdc++-v3/include/Makefile.am (working copy)
@@ -928,6 +928,7 @@ stamp-bits: ${bits_headers}
stamp-bits-sup: stamp-bits ${bits_sup_headers}
@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
+ @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits
@$(STAMP) stamp-bits-sup
stamp-c_base: ${c_base_headers}
Index: libstdc++-v3/include/Makefile.in
===================================================================
--- libstdc++-v3/include/Makefile.in (revision 169786)
+++ libstdc++-v3/include/Makefile.in (working copy)
@@ -1326,6 +1326,7 @@ stamp-bits: ${bits_headers}
stamp-bits-sup: stamp-bits ${bits_sup_headers}
@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
+ @-cd ${bits_builddir} && rm -f stamp-bits && $(STAMP) stamp-bits
@$(STAMP) stamp-bits-sup
stamp-c_base: ${c_base_headers}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
2011-02-07 16:34 [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file Simon Baldwin
@ 2011-02-07 17:08 ` Diego Novillo
2011-02-07 17:26 ` Paolo Carlini
0 siblings, 1 reply; 5+ messages in thread
From: Diego Novillo @ 2011-02-07 17:08 UTC (permalink / raw)
To: Simon Baldwin; +Cc: libstdc++, gcc-patches
On Mon, Feb 7, 2011 at 11:34, Simon Baldwin <simonb@google.com> wrote:
> This change removes the self-referential bits/stamp-bits and replaces it
> with a regular timestamp file, allowing cpio -L to handle it cleanly.
>
> Primarily needed for google/integration. OK?
Yes.
> Secondarily, equally applicable to trunk. OK there also?
I'll defer to the libstdc++ folks for this one.
Diego.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
2011-02-07 17:08 ` Diego Novillo
@ 2011-02-07 17:26 ` Paolo Carlini
2011-02-07 18:50 ` Ralf Wildenhues
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Carlini @ 2011-02-07 17:26 UTC (permalink / raw)
To: Diego Novillo; +Cc: Simon Baldwin, libstdc++, gcc-patches, Ralf Wildenhues
On 02/07/2011 06:07 PM, Diego Novillo wrote:
> I'll defer to the libstdc++ folks for this one.
>
In turn, before approving it, in particular such late in the 4.6.0
release process, I'd like to ear from Ralf...
Thanks,
Paolo.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
2011-02-07 17:26 ` Paolo Carlini
@ 2011-02-07 18:50 ` Ralf Wildenhues
2011-02-07 18:54 ` Paolo Carlini
0 siblings, 1 reply; 5+ messages in thread
From: Ralf Wildenhues @ 2011-02-07 18:50 UTC (permalink / raw)
To: Paolo Carlini; +Cc: Diego Novillo, Simon Baldwin, libstdc++, gcc-patches
* Paolo Carlini wrote on Mon, Feb 07, 2011 at 06:22:48PM CET:
> On 02/07/2011 06:07 PM, Diego Novillo wrote:
> > I'll defer to the libstdc++ folks for this one.
> >
> In turn, before approving it, in particular such late in the 4.6.0
> release process, I'd like to ear from Ralf...
Looks safe enough to me.
Eventually, this whole stamp file stuff in v3/include should probably
go, it is fragile and error-prone, and probably not needed. 4.7
material.
Thanks,
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file
2011-02-07 18:50 ` Ralf Wildenhues
@ 2011-02-07 18:54 ` Paolo Carlini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Carlini @ 2011-02-07 18:54 UTC (permalink / raw)
To: Ralf Wildenhues, Diego Novillo, Simon Baldwin, libstdc++, gcc-patches
Hi,
>>> I'll defer to the libstdc++ folks for this one.
>>>
>>>
>> In turn, before approving it, in particular such late in the 4.6.0
>> release process, I'd like to ear from Ralf...
>>
> Looks safe enough to me.
>
Ok then.
> Eventually, this whole stamp file stuff in v3/include should probably
> go, it is fragile and error-prone, and probably not needed. 4.7
> material.
>
I see, thanks for the suggestion, let's remember it when 4.6 branches!
Paolo.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-07 18:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-07 16:34 [libstdc++,google] Make bits/stamp-bits generated by libstc++-v3/include a regular file Simon Baldwin
2011-02-07 17:08 ` Diego Novillo
2011-02-07 17:26 ` Paolo Carlini
2011-02-07 18:50 ` Ralf Wildenhues
2011-02-07 18:54 ` Paolo Carlini
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).