Integrate:

[ 31287]
Subject: linux arm cross-compilation
Message-ID: <4659F6E2.3090805@vkonovalov.ru>

with adjustments to the MANIFEST

[just the configpm part]
p4raw-link: @31287 on //depot/perl: 8ed6d636bbf576aca711d971b9e9893460c96ecc

p4raw-id: //depot/maint-5.8/perl@32534
p4raw-integrated: from //depot/perl@31287 'merge in' configpm
	(@28210..)

1 files changed, 13 insertions, 6 deletions

diff --git a/configpm b/configpm
index b3749b3984..a0162c3343 100755
--- a/configpm
+++ b/configpm
@@ -2,8 +2,8 @@
 #
 # configpm
 #
-# Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Larry Wall and others.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007 Larry Wall and others.
 #
 #
 # Regenerate the files
@@ -13,6 +13,7 @@
 #    lib/Config.pod
 #    lib/Cross.pm (optionally)
 #
+#
 # from the contents of the static files
 #
 #    Porting/Glossary
@@ -22,6 +23,8 @@
 #
 #    config.sh
 #
+# Note that output directory is xlib/[cross-name]/ for cross-compiling
+#
 # It will only update Config.pm and Config_heavy.pl if the contents of
 # either file would be different. Note that *both* files are updated in
 # this case, since for example an extension makefile that has a dependency
@@ -82,7 +85,7 @@ sub opts {
 
 my %Opts = opts();
 
-my ($Config_PM, $Config_heavy);
+my ($Config_SH, $Config_PM, $Config_heavy, $Config_POD);
 my $Glossary = 'Porting/Glossary';
 
 if ($Opts{cross}) {
@@ -90,9 +93,13 @@ if ($Opts{cross}) {
   mkdir "xlib";
   mkdir "xlib/$Opts{cross}";
   $Config_PM = "xlib/$Opts{cross}/Config.pm";
+  $Config_POD = "xlib/$Opts{cross}/Config.pod";
+  $Config_SH = "Cross/config-$Opts{cross}.sh";
 }
 else {
   $Config_PM = "lib/Config.pm";
+  $Config_POD = "lib/Config.pod";
+  $Config_SH = "config.sh";
 }
 ($Config_heavy = $Config_PM) =~ s/\.pm$/_heavy.pl/;
 die "Can't automatically determine name for Config_heavy.pl from '$Config_PM'"
@@ -175,7 +182,7 @@ my %Data     = ();
 my %seen_quotes;
 {
   my ($name, $val);
-  open(CONFIG_SH, 'config.sh') || die "Can't open config.sh: $!";
+  open(CONFIG_SH, $Config_SH) || die "Can't open $Config_SH: $!";
   while (<CONFIG_SH>) {
     next if m:^#!/bin/sh:;
 
@@ -708,7 +715,7 @@ tie %%Config, 'Config', {
 ENDOFTIE
 
 
-open(CONFIG_POD, ">lib/Config.pod") or die "Can't open lib/Config.pod: $!";
+open(CONFIG_POD, ">$Config_POD") or die "Can't open $Config_POD: $!";
 print CONFIG_POD <<'ENDOFTAIL';
 =head1 NAME
 
@@ -908,7 +915,7 @@ ENDOFTAIL
 
 close(GLOS) if $Opts{glossary};
 close(CONFIG_POD);
-print "written lib/Config.pod\n";
+print "written $Config_POD\n";
 
 my $orig_config_txt = "";
 my $orig_heavy_txt = "";