X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a5094cb03518019abe3dfffccbe657c8edc0e0c2..6987f4434e4dfee71506125954ee1ae41c46f1cb:/configpm diff --git a/configpm b/configpm index 87feab5..0451f2d 100755 --- a/configpm +++ b/configpm @@ -11,7 +11,6 @@ # lib/Config.pm # lib/Config_heavy.pl # lib/Config.pod -# lib/Cross.pm (optionally) # # # from the contents of the static files @@ -23,7 +22,6 @@ # # 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 @@ -32,13 +30,12 @@ sub usage { die < '', # --cross=PLATFORM - crosscompiling for PLATFORM 'glossary' => 1, # --no-glossary - no glossary file inclusion, # for compactness 'chdir' => '', # --chdir=dir - change directory before writing files @@ -94,19 +124,10 @@ if ($Opts{chdir}) { my ($Config_SH, $Config_PM, $Config_heavy, $Config_POD); my $Glossary = 'Porting/Glossary'; -if ($Opts{cross}) { - # creating cross-platform config file - 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_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'" if $Config_heavy eq $Config_PM; @@ -114,86 +135,47 @@ die "Can't automatically determine name for Config_heavy.pl from '$Config_PM'" my $config_txt; my $heavy_txt; -$heavy_txt .= <<'ENDOFBEG'; -# 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; Pulls in Carp -# use vars pulls in Carp - -sub _V { - my ($bincompat, $non_bincompat, $date, @patches) = Internals::V(); - - my $opts = join ' ', sort split ' ', "$bincompat $non_bincompat"; - - # wrap at 76 columns. - - $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 " Compile-time options: $opts\n"; - - if (@patches) { - print " Locally applied patches:\n"; - print "\t$_\n" foreach @patches; - } - - print " Built under $^O\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'; - - if (@env) { - print " \%ENV:\n"; - print " $_\n" foreach @env; - } - print " \@INC:\n"; - print " $_\n" foreach @INC; -} - -ENDOFBEG +my $export_funcs = <<'EOT'; +my %Export_Cache = (myconfig => 1, config_sh => 1, config_vars => 1, + config_re => 1, compile_date => 1, local_patches => 1, + bincompat_options => 1, non_bincompat_options => 1, + header_files => 1); +EOT -my $myver = sprintf "%vd", $^V; +my %export_ok = eval $export_funcs or die; -$config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3; +$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. # for a description of the variables, please have a look at the # Glossary file, as written in the Porting folder, or use the url: -# http://perl5.git.perl.org/perl.git/blob/HEAD:/Porting/Glossary +# https://github.com/Perl/perl5/blob/blead/Porting/Glossary package Config; use strict; -# use warnings; Pulls in Carp -# use vars pulls in Carp +use warnings; +our ( %%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 +# lifetime of Perl 5. +%s @Config::EXPORT = qw(%%Config); -@Config::EXPORT_OK = qw(myconfig config_sh config_vars config_re); +@Config::EXPORT_OK = keys %%Export_Cache; # Need to stub all the functions to make code such as print Config::config_sh # keep working -sub myconfig; -sub config_sh; -sub config_vars; -sub config_re; +EOT -# 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 -# lifetime of Perl 5. -my %%Export_Cache = map {($_ => 1)} @Config::EXPORT_OK; +$config_txt .= "sub $_;\n" foreach sort keys %export_ok; -our %%Config; +my $myver = sprintf "%vd", $^V; + +$config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3; # Define our own import method to avoid pulling in the full Exporter: sub import { @@ -215,12 +197,11 @@ sub import { return; } -die "Perl lib version (%s) doesn't match executable 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 version (" . - sprintf("v%%vd",$^V) . ")"; + or die sprintf "%%s: Perl lib version (%s) doesn't match executable '$^X' version (%%vd)", $0, $^V; ENDOFBEG @@ -229,12 +210,26 @@ my @non_v = (); my @v_others = (); my $in_v = 0; my %Data = (); +my $quote; + +# These variables were set in older versions of Perl, but are no longer needed +# by the core. However, some CPAN modules may rely on them; in particular, Tk +# (at least up to version 804.034) fails to build without them. We force them +# to be emitted to Config_heavy.pl for backcompat with such modules (and we may +# find that this set needs to be extended in future). See RT#132347. +my @v_forced = map "$_\n", split /\n+/, <<'EOT'; +i_limits='define' +i_stdlib='define' +i_string='define' +i_time='define' +prototype='define' +EOT 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 () { next if m:^#!/bin/sh:; @@ -260,12 +255,15 @@ my %seen_quotes; push(@non_v, "#$_"); # not a name='value' line next; } - my $quote = $2; if ($in_v) { $val .= $_; } else { + $quote = $2; ($name,$val) = ($1,$3); + if ($name eq 'cc') { + $val =~ s{^(['"]?+).*\bccache\s+}{$1}; + } } $in_v = $val !~ /$quote\n/; next if $in_v; @@ -318,7 +316,7 @@ $fetch_string .= <<'EOT'; EOT } else { - # We only have ' delimted. + # We only have ' delimited. $fetch_string .= <<'EOT'; return undef unless $Config_SH_expanded =~ /\n$key=\'(.*?)\'\n/s; @@ -334,7 +332,7 @@ die if $@; # Calculation for the keys for byteorder # This is somewhat grim, but I need to run fetch_string here. -our $Config_SH_expanded = join "\n", '', @v_others; +$Config_SH_expanded = join "\n", '', @v_others; my $t = fetch_string ({}, 'ivtype'); my $s = fetch_string ({}, 'ivsize'); @@ -348,13 +346,12 @@ my $f = $t eq 'long' ? 'L!' : $s == 8 ? 'Q': 'I'; 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 { @@ -460,6 +457,75 @@ sub relocate_inc { } EOT +my $osname = fetch_string({}, 'osname'); +my $from = $osname eq 'VMS' ? 'PERLSHR image' : 'binary (from libperl)'; +my $env_cygwin = $osname eq 'cygwin' + ? 'push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $ENV{CYGWIN};' . "\n" : ""; + +$heavy_txt .= sprintf <<'ENDOFBEG', $osname, $osname, $from, $osname, $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; +our %%Config; + +sub bincompat_options { + return split ' ', (Internals::V())[0]; +} + +sub non_bincompat_options { + return split ' ', (Internals::V())[1]; +} + +sub compile_date { + return (Internals::V())[2] +} + +sub local_patches { + my (undef, undef, undef, @patches) = Internals::V(); + return @patches; +} + +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 = sort split ' ', "$bincompat $non_bincompat"; + + print Config::myconfig(); + print "\nCharacteristics of this %s: \n"; + + print " Compile-time options:\n"; + print " $_\n" for @opts; + + if (@patches) { + print " Locally applied patches:\n"; + print " $_\n" foreach @patches; + } + + print " Built under %s\n"; + + print " $date\n" if defined $date; + + my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %%ENV; +%s + if (@env) { + print " \%%ENV:\n"; + print " $_\n" foreach @env; + } + print " \@INC:\n"; + print " $_\n" foreach @INC; +} + +sub header_files { +ENDOFBEG + +$heavy_txt .= $header_files . "\n}\n\n"; + if (%need_relocation) { my $relocations_in_common; # otherlibdirs only features in the hash @@ -477,7 +543,7 @@ $heavy_txt .= join('', @non_v) . "\n"; # copy config summary format from the myconfig.SH script $heavy_txt .= "our \$summary = <<'!END!';\n"; -open(MYCONFIG,") && !/^Summary of/; do { $heavy_txt .= $_ } until !defined($_ = ) || /^\s*$/; close(MYCONFIG); @@ -507,8 +573,17 @@ sub myconfig { local *_ = \my $a; $_ = <<'!END!'; EOT - -$heavy_txt .= join('', sort @v_others) . "!END!\n"; +#proper lexicographical order of the keys +my %seen_var; +$heavy_txt .= join('', + map { $_->[-1] } + sort {$a->[0] cmp $b->[0] } + grep { !$seen_var{ $_->[0] }++ } + map { + /^([^=]+)/ ? [ $1, $_ ] + : [ $_, $_ ] # shouldnt happen + } @v_others, @v_forced +) . "!END!\n"; # Only need the dynamic byteorder code in Config.pm if 'byteorder' is one of # the precached keys @@ -575,6 +650,24 @@ foreach my $prefix (qw(libs libswanted)) { $heavy_txt .= "${prefix}_nolargefiles='$value'\n"; } +if (open(my $fh, '<', 'cflags')) { + my $ccwarnflags; + my $ccstdflags; + while (<$fh>) { + if (/^warn="(.+)"$/) { + $ccwarnflags = $1; + } elsif (/^stdflags="(.+)"$/) { + $ccstdflags = $1; + } + } + if (defined $ccwarnflags) { + $heavy_txt .= "ccwarnflags='$ccwarnflags'\n"; + } + if (defined $ccstdflags) { + $heavy_txt .= "ccstdflags='$ccstdflags'\n"; + } +} + $heavy_txt .= "EOVIRTUAL\n"; $heavy_txt .= <<'ENDOFGIT'; @@ -594,10 +687,9 @@ sub FETCH { my($self, $key) = @_; # check for cached value (which may be undef so we use exists not defined) - return $self->{$key} if exists $self->{$key}; - - return $self->fetch_string($key); + return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key); } + ENDOFEND $heavy_txt .= <<'ENDOFEND'; @@ -645,9 +737,7 @@ $heavy_txt .= <<'ENDOFEND'; } sub STORE { die "\%Config::Config is read-only\n" } -*DELETE = \&STORE; -*CLEAR = \&STORE; - +*DELETE = *CLEAR = \*STORE; # Typeglob aliasing uses less space sub config_sh { substr $Config_SH_expanded, 1, $config_sh_len; @@ -748,8 +838,8 @@ if ($Common{byteorder}) { } 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 { } @@ -766,10 +856,12 @@ tie %%Config, 'Config', { ENDOFTIE -open(CONFIG_POD, ">$Config_POD") or die "Can't open $Config_POD: $!"; +open(CONFIG_POD, '>', $Config_POD) or die "Can't open $Config_POD: $!"; print CONFIG_POD <<'ENDOFTAIL'; =head1 NAME +=for comment Generated by configpm. Any changes made here will be lost! + Config - access Perl configuration information =head1 SYNOPSIS @@ -804,14 +896,14 @@ named variable exists. For a description of the variables, please have a look at the Glossary file, as written in the Porting folder, or use the url: -http://perl5.git.perl.org/perl.git/blob/HEAD:/Porting/Glossary +https://github.com/Perl/perl5/blob/blead/Porting/Glossary =over 4 =item myconfig() Returns a textual summary of the major perl configuration values. -See also C<-V> in L. +See also C<-V> in L. =item config_sh() @@ -831,7 +923,34 @@ printed on a separate line in the form: name='value'; Names which are unknown are output as C. -See also C<-V:name> in L. +See also C<-V:name> in L. + +=item bincompat_options() + +Returns a list of C pre-processor options used when compiling this F +binary, which affect its binary compatibility with extensions. +C and C are shown together in +the output of C as I. + +=item non_bincompat_options() + +Returns a list of C pre-processor options used when compiling this F +binary, which do not affect binary compatibility with extensions. + +=item compile_date() + +Returns the compile date (as a string), equivalent to what is shown by +C + +=item local_patches() + +Returns a list of the names of locally applied patches, equivalent to what +is shown by C. + +=item header_files() + +Returns a list of the header files that should be used as dependencies for +XS code, for this version of Perl on this platform. =back @@ -892,11 +1011,12 @@ in such cases. ENDOFTAIL if ($Opts{glossary}) { - open(GLOS, "<$Glossary") or die "Can't open $Glossary: $!"; + open(GLOS, '<', $Glossary) or die "Can't open $Glossary: $!"; } my %seen = (); my $text = 0; $/ = ''; +my $errors= 0; sub process { if (s/\A(\w*)\s+\(([\w.]+)\):\s*\n(\t?)/=item C<$1>\n\nFrom F<$2>:\n\n/m) { @@ -905,23 +1025,21 @@ sub process { print CONFIG_POD < new paragraph @@ -930,7 +1048,7 @@ EOF s{([\'\"])([^\'\"\s]+)\1}(C<$2>)g; # "date" command s{\'([A-Za-z_\- *=/]+)\'}(C<$1>)g; # 'ln -s' s{ - (?lib/Cross.pm" or die "Can not open >lib/Cross.pm: $!"; - my $cross = <<'EOS'; -# typical invocation: -# perl -MCross Makefile.PL -# perl -MCross=wince -V:cc -package Cross; - -sub import { - my ($package,$platform) = @_; - unless (defined $platform) { - # if $platform is not specified, then use last one when - # 'configpm; was invoked with --cross option - $platform = '***replace-marker***'; - } - @INC = map {/\blib\b/?(do{local $_=$_;s/\blib\b/xlib\/$platform/;$_},$_):($_)} @INC; - $::Cross::platform = $platform; -} - -1; -EOS - $cross =~ s/\*\*\*replace-marker\*\*\*/$Opts{cross}/g; - print CROSS $cross; - close CROSS; - print "written lib/Cross.pm\n"; - unshift(@INC,"xlib/$Opts{cross}"); -} - # Now do some simple tests on the Config.pm file we have created unshift(@INC,'lib'); -unshift(@INC,'xlib/symbian') if $Opts{cross}; require $Config_PM; require $Config_heavy; import Config; @@ -1161,7 +1255,6 @@ cppflags: 185 ptrsize: 185 shrpenv: 185 static_ext: 185 -use5005threads: 185 uselargefiles: 185 alignbytes: 184 byteorder: 184