arm patches to rc1

Message-Id: <1073949147.10300.143.camel@ragefire>
Date: Mon, 12 Jan 2004 18:12:27 -0500

p4raw-id: //depot/maint-5.8/perl@22146

diff --git a/Cross/Makefile b/Cross/Makefile
index da9ce10..0db6ebf 100644 (file)
--- a/Cross/Makefile
+++ b/Cross/Makefile
@@ -1,6 +1,6 @@
 ## Toplevel Makefile for cross-compilation of perl
 #
-## $Id: Makefile,v 1.5 2003/12/12 00:48:19 red Exp red $
+## $Id: Makefile,v 1.7 2004/01/12 15:41:02 red Exp red $
 
 export TOPDIR=${shell pwd}
 include $(TOPDIR)/config
@@ -45,6 +45,10 @@ patch:
                sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \
                touch CROSS_PATCHED ; fi
 
+dry_patch:
+       cd .. ; patch --dry-run -p1 < Cross/Makefile.SH.patch; \
+               patch --dry-run -p1 < Cross/installperl.patch; \
+
 perl:
        @echo Perl cross-build directory is $(TOPDIR)
        @echo Target arch is $(SYS)

diff --git a/Cross/Makefile.SH.patch b/Cross/Makefile.SH.patch
index 567db60..661ea20 100644 (file)
--- a/Cross/Makefile.SH.patch
+++ b/Cross/Makefile.SH.patch
@@ -122,7 +122,7 @@
        -@test -f extra.pods && rm -f `cat extra.pods`
        -@rm -f extra.pods
        -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -796,18 +797,7 @@
+@@ -798,18 +799,7 @@
  INSTALL_DEPENDENCE = all
 
  install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -142,7 +142,7 @@
  
  # XXX Experimental. Hardwired values, but useful for testing.
  # Eventually Configure could ask for some of these values.
-@@ -923,16 +913,16 @@
+@@ -925,16 +915,16 @@
  #
  # DynaLoader may be needed for extensions that use Makefile.PL.
  
@@ -163,7 +163,7 @@
        @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
  .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
-@@ -1072,7 +1062,7 @@
+@@ -1074,7 +1064,7 @@
  
  test_prep_pre: preplibrary utilities $(nonxs_ext)
  
@@ -172,7 +172,7 @@
        PERL=./perl $(MAKE) _test_prep
  
  _test_tty:
-@@ -1165,7 +1155,7 @@
+@@ -1167,7 +1157,7 @@
  
  # Can't depend on lib/Config.pm because that might be where miniperl
  # is crashing.