In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/175046355f077016734ad8701ddd6ecb790a1591?hp=8165faea6ee20f11c287f0f531d49cc63ea9e6f3>
- Log ----------------------------------------------------------------- commit 175046355f077016734ad8701ddd6ecb790a1591 Author: Steffen Mueller <[email protected]> Date: Sun Apr 18 16:24:20 2010 +0200 EU::MakeMaker shouldn't warn about prereqs in core This silences warnings about missing prerequisites when part of a perl core build. Triggered by #74442. M cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm M cpan/ExtUtils-MakeMaker/t/prereq.t commit 460fdedb7c436afaa24f04e2b7b35efbf4418573 Author: Robin Barker <ro...@spade-ubuntu.(none)> Date: Thu Apr 15 21:14:23 2010 +0100 Make abstract_from more robust A few distributions in the perl source failure for abstract_from Rather than fix the individual files I have made the parsing process more robust. M cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ----------------------------------------------------------------------- Summary of changes: cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 6 ++++-- cpan/ExtUtils-MakeMaker/t/prereq.t | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index 239d6df..564d321 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -2593,7 +2593,7 @@ sub parse_abstract { $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod; next if !$inpod; chop; - next unless /^($package\s-\s)(.*)/; + next unless /^($package(?:\.pm)?\s+\-+\s+)(.*)/; $result = $2; last; } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm index 4422b68..22ede40 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm @@ -467,14 +467,16 @@ END if (!$installed_file) { warn sprintf "Warning: prerequisite %s %s not found.\n", $prereq, $required_version - unless $self->{PREREQ_FATAL}; + unless $self->{PREREQ_FATAL} + or $ENV{PERL_CORE}; $unsatisfied{$prereq} = 'not installed'; } elsif ($pr_version < $required_version ){ warn sprintf "Warning: prerequisite %s %s not found. We have %s.\n", $prereq, $required_version, ($pr_version || 'unknown version') - unless $self->{PREREQ_FATAL}; + unless $self->{PREREQ_FATAL} + or $ENV{PERL_CORE}; $unsatisfied{$prereq} = $required_version ? $required_version : 'unknown version' ; } diff --git a/cpan/ExtUtils-MakeMaker/t/prereq.t b/cpan/ExtUtils-MakeMaker/t/prereq.t index cd5d18d..4a537a5 100644 --- a/cpan/ExtUtils-MakeMaker/t/prereq.t +++ b/cpan/ExtUtils-MakeMaker/t/prereq.t @@ -35,6 +35,9 @@ ok( chdir 'Big-Dummy', "chdir'd to Big-Dummy" ) || local $SIG{__WARN__} = sub { $warnings .= join '', @_; }; + # prerequisite warnings are disbled while building the perl core: + local %ENV; + delete $ENV{PERL_CORE}; WriteMakefile( NAME => 'Big::Dummy', -- Perl5 Master Repository
