diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-09-23 18:27:33 +0100 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-09-23 18:27:33 +0100 |
commit | c6ba15252667d61624481a75c7b61acee4e89cb3 (patch) | |
tree | b814b257d03fa98fc55b7613b51336dacaed01ee /cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | |
parent | c7a5ab2295268a0a954737f6575ae246e38faf3f (diff) | |
download | perl-c6ba15252667d61624481a75c7b61acee4e89cb3.tar.gz |
Update ExtUtils-MakeMaker to CPAN version 6.78
[DELTA]
6.78 Mon Sep 23 13:44:39 BST 2013
No changes from 6.77_08
6.77_08 Sun Sep 22 18:43:23 BST 2013
New feature:
* Made UNINST an attribute, so removing shadowed modules
can be set 'perl Makefile.PL UNINST=1'
6.77_07 Sat Sep 21 09:44:19 BST 2013
Bug fixes:
* do not set default switches in Test::Harness; not even -w
6.77_06 Thu Sep 19 15:36:59 BST 2013
Dist fixes:
* Previous tarball was corrupted
6.77_05 Thu Sep 19 14:09:00 BST 2013
Bug fixes:
* Fix 3 more tests to work in parallel. Now works with HARNESS_OPTIONS=j64
6.77_04 Wed Sep 18 19:23:38 BST 2013
Bug fixes:
* Fixed PERL_SRC for core tests after parallelisation
enhancements were made in 6.77_01
6.77_03 Mon Sep 16 12:20:25 BST 2013
VMS fixes:
* CCFLAGS may have appendages not from PERL_MM_OPT
6.77_02 Thu Sep 12 21:21:12 BST 2013
Bug fixes:
* Support 'perl' as a PREREQ_PM target
* RT#77029 Support linefeeds in abstract parsing
* Skip some tests when cross-compiling core
6.77_01 Tue Sep 10 15:20:42 BST 2013
Bug fixes:
* RT#7248 warn if NAME is not valid package name
* Perl#36539 reverse search order for finding perl
* parse_version() should work with taint mode now
* RT#69590 enable tests to be run in parallel
Diffstat (limited to 'cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm')
-rw-r--r-- | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm index 4b928fd871..a7e7ff3bb3 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm @@ -18,7 +18,7 @@ our @Overridable; my @Prepend_parent; my %Recognized_Att_Keys; -our $VERSION = '6.76'; +our $VERSION = '6.78'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] # Emulate something resembling CVS $Revision$ @@ -281,7 +281,7 @@ sub full_setup { PERL_SRC PERM_DIR PERM_RW PERM_RWX PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ - SIGN SKIP TEST_REQUIRES TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG + SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG XS_VERSION clean depend dist dynamic_lib linkext macro realclean tool_autosplit @@ -481,10 +481,24 @@ END foreach my $prereq (sort keys %$prereqs) { my $required_version = $prereqs->{$prereq}; - my $installed_file = MM->_installed_file_for_module($prereq); my $pr_version = 0; - $pr_version = MM->parse_version($installed_file) if $installed_file; - $pr_version = 0 if $pr_version eq 'undef'; + my $installed_file; + + if ( $prereq eq 'perl' ) { + if ( defined $required_version && $required_version =~ /^v?[\d_\.]+$/ + || $required_version !~ /^v?[\d_\.]+$/ ) { + require version; + my $normal = eval { version->parse( $required_version ) }; + $required_version = $normal if defined $normal; + } + $installed_file = $prereq; + $pr_version = $]; + } + else { + $installed_file = MM->_installed_file_for_module($prereq); + $pr_version = MM->parse_version($installed_file) if $installed_file; + $pr_version = 0 if $pr_version eq 'undef'; + } # convert X.Y_Z alpha version #s to X.YZ for easier comparisons $pr_version =~ s/(\d+)\.(\d+)_(\d+)/$1.$2$3/; @@ -593,6 +607,9 @@ END $self->{NAME} ||= $self->guess_name; + warn "Warning: NAME must be a package name\n" + unless $self->{NAME} =~ m!^[A-Z_a-z][0-9A-Z_a-z]*(?:::[0-9A-Z_a-z]+)*$!; + ($self->{NAME_SYM} = $self->{NAME}) =~ s/\W+/_/g; $self->init_MAKE; |