Change 30206 by [EMAIL PROTECTED] on 2007/02/10 22:44:37

        Integrate:
        [ 27201]
        Remove lib/Hash directory when doing make distclean
        
        [ 28482]
        Make the distclean target remove lib/Hash correctly
        
        [ 28615]
        Very recent development versions of gcc (4.2.0 20060715) seem
        to have switched from '<command line>' to '<command-line>'.
        
        [ 29871]
        perl rebuilds because of gcc's -g flag
        Subject: [PATCH] Re: [perl #41058] make rebuilds perl everytime
        From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
        Date: Thu, 18 Jan 2007 14:27:55 +0100
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/maint-5.8/perl/Makefile.SH#65 integrate
... //depot/maint-5.8/perl/makedepend.SH#4 integrate

Differences ...

==== //depot/maint-5.8/perl/Makefile.SH#65 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#64~30115~  2007-02-04 10:49:54.000000000 -0800
+++ perl/Makefile.SH    2007-02-10 14:44:37.000000000 -0800
@@ -1130,13 +1130,13 @@
        rm -rf .config
        rm -f preload
        rm -f testcompile compilelog
-       rm -rf lib/Encode
+       rm -rf lib/Encode lib/Hash
        rm -f lib/ExtUtils/ParseXS/t/XSTest.c
        rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT)
        rm -f lib/ExtUtils/ParseXS/t/XSTest$(DLSUFFIX)
        -rmdir lib/B lib/Data
        -rmdir lib/Filter/Util lib/IO/Socket lib/IO
-       -rmdir lib/List lib/MIME lib/Scalar lib/Sys 
+       -rmdir lib/List lib/MIME lib/Scalar lib/Sys
        -rmdir lib/threads lib/XS
 
 _realcleaner:

==== //depot/maint-5.8/perl/makedepend.SH#4 (xtext) ====
Index: perl/makedepend.SH
--- perl/makedepend.SH#3~19704~ 2003-06-06 22:24:27.000000000 -0700
+++ perl/makedepend.SH  2007-02-10 14:44:37.000000000 -0800
@@ -167,7 +167,9 @@
             -e '/^#.*<builtin>/d' \
             -e '/^#.*<built-in>/d' \
             -e '/^#.*<command line>/d' \
+            -e '/^#.*<command-line>/d' \
            -e '/^#.*"-"/d' \
+           -e '/^#.*"\/.*\/"/d' \
            -e '/: file path prefix .* never used$/d' \
            -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
            -e 's/^[     ]*#[    ]*line/#/' \
End of Patch.

Reply via email to