# This is the list from MM_VMS, plus pad.h, parser.h, perlsfio.h utf8.h
# which it installs. It *doesn't* install perliol.h - FIXME.
my @header_files = qw(EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h
- embed.h embedvar.h form.h gv.h handy.h hv.h intrpvar.h
+ embed.h embedvar.h form.h gv.h handy.h hv.h hv_func.h intrpvar.h
iperlsys.h keywords.h mg.h nostdio.h op.h opcode.h
pad.h parser.h patchlevel.h perl.h perlio.h perlsdio.h
perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h
regcomp.h regexp.h regnodes.h scope.h sv.h thread.h utf8.h
util.h);
-# No point in adding fakethr.h, as it no longer works
push @header_files,
$^O eq 'VMS' ? 'vmsish.h' : qw(dosish.h perliol.h time64.h unixish.h);
my $config_txt;
my $heavy_txt;
-$heavy_txt .= <<'ENDOFBEG';
+my $from = $^O eq 'VMS' ? 'PERLSHR image' : 'binary (from libperl)';
+my $env_cygwin = $^O eq 'cygwin'
+ ? 'push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $ENV{CYGWIN};' . "\n" : "";
+$heavy_txt .= sprintf <<'ENDOFBEG', $^O, $^O, $from, $^O, $env_cygwin;
# This file was created by configpm when Perl was built. Any changes
# made to this file will be lost the next time perl is built.
package Config;
use strict;
use warnings;
-use vars '%Config';
+use vars '%%Config';
sub bincompat_options {
return split ' ', (Internals::V())[0];
}
sub _V {
+ die "Perl lib was built for '%s' but is being run on '$^O'"
+ unless "%s" eq $^O;
+
my ($bincompat, $non_bincompat, $date, @patches) = Internals::V();
my $opts = join ' ', sort split ' ', "$bincompat $non_bincompat";
$opts =~ s/(?=.{53})(.{1,53}) /$1\n /mg;
print Config::myconfig();
- if ($^O eq 'VMS') {
- print "\nCharacteristics of this PERLSHR image: \n";
- } else {
- print "\nCharacteristics of this binary (from libperl): \n";
- }
+ print "\nCharacteristics of this %s: \n";
print " Compile-time options: $opts\n";
print "\t$_\n" foreach @patches;
}
- print " Built under $^O\n";
+ print " Built under %s\n";
print " $date\n" if defined $date;
- my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
- push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin' and $ENV{CYGWIN};
-
+ my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %%ENV;
+%s
if (@env) {
- print " \%ENV:\n";
+ print " \%%ENV:\n";
print " $_\n" foreach @env;
}
print " \@INC:\n";
my %export_ok = eval $export_funcs or die;
-$config_txt .= sprintf << 'EOT', $export_funcs;
+$config_txt .= sprintf << 'EOT', $], $export_funcs;
# This file was created by configpm when Perl was built. Any changes
# made to this file will be lost the next time perl is built.
package Config;
use strict;
use warnings;
-use vars '%%Config';
+use vars '%%Config', '$VERSION';
+
+$VERSION = "%s";
# Skip @Config::EXPORT because it only contains %%Config, which we special
# case below as it's not a function. @Config::EXPORT won't change in the
return;
}
-die "Perl lib version (%s) doesn't match executable '$0' version ($])"
+die "$0: Perl lib version (%s) doesn't match executable '$^X' version ($])"
unless $^V;
$^V eq %s
- or die "Perl lib version (%s) doesn't match executable '$0' version (" .
- sprintf("v%%vd",$^V) . ")";
+ or die sprintf "%%s: Perl lib version (%s) doesn't match executable '$^X' version (%%vd)", $0, $^V;
ENDOFBEG
EOT
} else {
- # We only have ' delimted.
+ # We only have ' delimited.
$fetch_string .= <<'EOT';
return undef unless $Config_SH_expanded =~ /\n$key=\'(.*?)\'\n/s;
my $byteorder_code;
if ($s == 4 || $s == 8) {
- my $list = join ',', reverse(2..$s);
+ my $list = join ',', reverse(1..$s-1);
my $format = 'a'x$s;
$byteorder_code = <<"EOT";
-my \$i = 0;
-foreach my \$c ($list) { \$i |= ord(\$c); \$i <<= 8 }
-\$i |= ord(1);
+my \$i = ord($s);
+foreach my \$c ($list) { \$i <<= 8; \$i |= ord(\$c); }
our \$byteorder = join('', unpack('$format', pack('$f', \$i)));
EOT
} else {
}
my $fast_config = join '', map { " $_,\n" } sort values %Common;
-# Sanity check needed to stop an infite loop if Config_heavy.pl fails to define
-# &launcher for some reason (eg it got truncated)
+# Sanity check needed to stop an infinite loop if Config_heavy.pl fails to
+# define &launcher for some reason (eg it got truncated)
$config_txt .= sprintf <<'ENDOFTIE', $fast_config;
sub DESTROY { }
=item myconfig()
Returns a textual summary of the major perl configuration values.
-See also C<-V> in L<perlrun/Switches>.
+See also C<-V> in L<perlrun/Command Switches>.
=item config_sh()
name='value';
Names which are unknown are output as C<name='UNKNOWN';>.
-See also C<-V:name> in L<perlrun/Switches>.
+See also C<-V:name> in L<perlrun/Command Switches>.
=item bincompat_options()
s{([\'\"])([^\'\"\s]+)\1}(C<$2>)g; # "date" command
s{\'([A-Za-z_\- *=/]+)\'}(C<$1>)g; # 'ln -s'
s{
- (?<! [\w./<\'\"] ) # Only standalone file names
+ (?<! [\w./<\'\"\$] ) # Only standalone file names
(?! e \. g \. ) # Not e.g.
(?! \. \. \. ) # Not ...
(?! \d ) # Not 5.004
# 'configpm; was invoked with --cross option
$platform = '***replace-marker***';
}
+ #a Perl debugger can load a bunch of modules before -MCross with PERL5DB env
+ #var, stopping a cross compile Config.pm from being loaded because the native
+ #Config.pm was already use'd
+ if(exists $INC{'Config.pm'}) {
+ warn "Cross.pm found Config.pm is already loaded, reload required, will delete from %INC";
+ delete $INC{'Config.pm'};
+ }
@INC = map {/\blib\b/?(do{local $_=$_;s/\blib\b/xlib\/$platform/;$_},$_):($_)} @INC;
$::Cross::platform = $platform;
}
https://perl5.git.perl.org / perl5.git / blobdiff