Change 33635 by [EMAIL PROTECTED] on 2008/04/03 10:53:54
Integrate:
[ 23984]
Add corelist to the win32 makefiles
(noticed by demerphq)
[ 33619]
Integrate:
[ 33326]
Subject: [PATCH] Don't install threads files on non-threaded Perls
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 15 Feb 2008 11:02:54 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 33358]
Subject: [PATCH] Revert change 33326
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 22 Feb 2008 16:21:14 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 33633]
Integrate:
[ 33542]
Subject: [PATCH] Fixing "make distclean" to remove "config.arch"
From: Sérgio Durigan Júnior <[EMAIL PROTECTED]>
Date: Tue, 18 Mar 2008 15:35:54 -0300
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Makefile.SH#75 integrate
... //depot/maint-5.8/perl/installperl#40 integrate
... //depot/maint-5.8/perl/win32/Makefile#74 integrate
... //depot/maint-5.8/perl/win32/makefile.mk#82 integrate
Differences ...
==== //depot/maint-5.8/perl/Makefile.SH#75 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#74~33200~ 2008-02-02 09:49:45.000000000 -0800
+++ perl/Makefile.SH 2008-04-03 03:53:54.000000000 -0700
@@ -1117,7 +1117,7 @@
-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
-rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL)
libperl.* microperl
-rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old
- -rm -f config.over
+ -rm -f config.arch config.over
# Do not 'make _tidy' directly.
_tidy:
==== //depot/maint-5.8/perl/win32/Makefile#74 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#73~32435~ 2007-11-21 08:04:47.000000000 -0800
+++ perl/win32/Makefile 2008-04-03 03:53:54.000000000 -0700
@@ -627,6 +627,7 @@
..\utils\libnetcfg \
..\utils\enc2xs \
..\utils\piconv \
+ ..\utils\corelist \
..\utils\cpan \
..\utils\xsubpp \
..\utils\prove \
@@ -1203,7 +1204,7 @@
podchecker podselect
-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
- xsubpp instmodsh prove
+ xsubpp instmodsh prove corelist
-cd ..\x2p && del /f find2perl s2p psed *.bat
-del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \
perlmainst.c
==== //depot/maint-5.8/perl/win32/makefile.mk#82 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#81~32435~ 2007-11-21 08:04:47.000000000 -0800
+++ perl/win32/makefile.mk 2008-04-03 03:53:54.000000000 -0700
@@ -765,6 +765,7 @@
..\utils\libnetcfg \
..\utils\enc2xs \
..\utils\piconv \
+ ..\utils\corelist \
..\utils\cpan \
..\utils\xsubpp \
..\utils\prove \
@@ -1515,7 +1516,7 @@
podchecker podselect
-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
- xsubpp instmodsh prove
+ xsubpp instmodsh prove corelist
-cd ..\x2p && del /f find2perl s2p psed *.bat
-del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \
perlmainst.c
End of Patch.