Change 30699 by [EMAIL PROTECTED] on 2007/03/22 21:48:18
Integrate:
[ 28904]
Subject: [PATCH] Minor re 'Debug' tweaks, also fix a bug in dumping
certain patterns.
From: demerphq <[EMAIL PROTECTED]>
Date: Fri, 29 Sep 2006 17:39:16 +0200
Message-ID: <[EMAIL PROTECTED]>
[ 29308]
Subject: [perl #36909] $^R undefined on matches involving backreferences
From: yves orton via RT <[EMAIL PROTECTED]>
Date: Nov 17, 2006 4:07 PM
[ 29323]
Extend the test-reonly make target on windows (Yves Orton)
[ 29355]
Update makefile.mk as per Makefile w.r.t. #29308 and #29323
Affected files ...
... //depot/maint-5.8/perl/win32/Makefile#66 integrate
... //depot/maint-5.8/perl/win32/makefile.mk#74 integrate
Differences ...
==== //depot/maint-5.8/perl/win32/Makefile#66 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#65~30698~ 2007-03-22 14:42:58.000000000 -0700
+++ perl/win32/Makefile 2007-03-22 14:48:18.000000000 -0700
@@ -498,6 +498,7 @@
# we add LIBC here, since we may be using PerlCRT.dll
LIBFILES = $(LIBBASEFILES) $(LIBC)
+#EXTRACFLAGS = -nologo -GF -W4 -wd4127 -wd4706
EXTRACFLAGS = -nologo -GF -W3
CFLAGS = $(EXTRACFLAGS) $(INCLUDES) $(DEFINES) $(LOCDEFS) \
$(PCHFLAGS) $(OPTIMIZE)
@@ -1140,14 +1141,17 @@
#-------------------------------------------------------------------------------
Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
+ $(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic
Extensions_reonly: buildext.pl $(PERLDEP) $(CONFIGPM)
+ $(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic
+re
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic +re
Extensions_static : buildext.pl $(PERLDEP) $(CONFIGPM)
+ $(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static
$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static
$(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static
@@ -1365,7 +1369,7 @@
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
cd ..\t
- $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg
+ $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg \bre\b \bsubst
\brxcode $(EXTRA)
cd ..\win32
regen :
==== //depot/maint-5.8/perl/win32/makefile.mk#74 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#73~30698~ 2007-03-22 14:42:58.000000000 -0700
+++ perl/win32/makefile.mk 2007-03-22 14:48:18.000000000 -0700
@@ -1564,7 +1564,7 @@
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
cd ..\t && \
- $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg \bre\b $(EXTRA) &&
\
+ $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg \bre\b \bsubst
\brxcode $(EXTRA) && \
cd ..\win32
regen :
End of Patch.
