diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-03-08 13:45:29 +0000 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-03-08 13:45:29 +0000 |
commit | d6f4d13d11a6a780ab6f0fc8156ec350a7da07b2 (patch) | |
tree | 1a88267715cade2916a819b8dbec9b9e5d6a4b0f /dist/ExtUtils-CBuilder | |
parent | 9df8b0369cf1fa05bbde3477e84a2912b5a9af12 (diff) | |
download | perl-d6f4d13d11a6a780ab6f0fc8156ec350a7da07b2.tar.gz |
Incorporate changes from CPAN release of ExtUtils-CBuilder
Diffstat (limited to 'dist/ExtUtils-CBuilder')
-rw-r--r-- | dist/ExtUtils-CBuilder/Changes | 10 | ||||
-rw-r--r-- | dist/ExtUtils-CBuilder/LICENSE | 8 | ||||
-rw-r--r-- | dist/ExtUtils-CBuilder/Makefile.PL | 44 |
3 files changed, 34 insertions, 28 deletions
diff --git a/dist/ExtUtils-CBuilder/Changes b/dist/ExtUtils-CBuilder/Changes index d93e58e6b9..5c03667c9e 100644 --- a/dist/ExtUtils-CBuilder/Changes +++ b/dist/ExtUtils-CBuilder/Changes @@ -1,5 +1,15 @@ Revision history for Perl extension ExtUtils::CBuilder. +0.280216 - 2014-03-07 + + Added: + + - Android support [Brian Fraser and Piotr Roszatycki] + + Fixed: + + - Teach ExtUtils::CBuilder to handle mod2fname properly [Brian Fraser] + 0.280212 - 2013-09-08 Fixed: diff --git a/dist/ExtUtils-CBuilder/LICENSE b/dist/ExtUtils-CBuilder/LICENSE index 0b4c12158a..822f88de92 100644 --- a/dist/ExtUtils-CBuilder/LICENSE +++ b/dist/ExtUtils-CBuilder/LICENSE @@ -1,4 +1,4 @@ -This software is copyright (c) 2013 by Ken Williams. +This software is copyright (c) 2014 by Ken Williams. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ b) the "Artistic License" --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2013 by Ken Williams. +This software is Copyright (c) 2014 by Ken Williams. This is free software, licensed under: @@ -22,7 +22,7 @@ This is free software, licensed under: Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -272,7 +272,7 @@ That's all there is to it! --- The Artistic License 1.0 --- -This software is Copyright (c) 2013 by Ken Williams. +This software is Copyright (c) 2014 by Ken Williams. This is free software, licensed under: diff --git a/dist/ExtUtils-CBuilder/Makefile.PL b/dist/ExtUtils-CBuilder/Makefile.PL index 4ea6bbc534..fb429cd4fb 100644 --- a/dist/ExtUtils-CBuilder/Makefile.PL +++ b/dist/ExtUtils-CBuilder/Makefile.PL @@ -1,4 +1,5 @@ +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.013. use strict; use warnings; @@ -21,6 +22,7 @@ my %WriteMakefileArgs = ( "NAME" => "ExtUtils::CBuilder", "PREREQ_PM" => { "Cwd" => 0, + "ExtUtils::MakeMaker" => "6.30", "File::Basename" => 0, "File::Spec" => "3.13", "File::Temp" => 0, @@ -32,37 +34,31 @@ my %WriteMakefileArgs = ( "TEST_REQUIRES" => { "Test::More" => "0.47" }, - "VERSION" => "0.280212", + "VERSION" => "0.280216", "test" => { "TESTS" => "t/*.t" } ); -unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { - my $tr = delete $WriteMakefileArgs{TEST_REQUIRES}; - my $br = $WriteMakefileArgs{BUILD_REQUIRES}; - for my $mod ( keys %$tr ) { - if ( exists $br->{$mod} ) { - $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; - } - else { - $br->{$mod} = $tr->{$mod}; - } - } -} +my %FallbackPrereqs = ( + "Cwd" => 0, + "ExtUtils::MakeMaker" => "6.30", + "File::Basename" => 0, + "File::Spec" => "3.13", + "File::Temp" => 0, + "IO::File" => 0, + "IPC::Cmd" => 0, + "Perl::OSType" => 1, + "Test::More" => "0.47", + "Text::ParseWords" => 0 +); -unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { - my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; - my $pp = $WriteMakefileArgs{PREREQ_PM}; - for my $mod ( keys %$br ) { - if ( exists $pp->{$mod} ) { - $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; - } - else { - $pp->{$mod} = $br->{$mod}; - } - } + +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + delete $WriteMakefileArgs{TEST_REQUIRES}; + delete $WriteMakefileArgs{BUILD_REQUIRES}; + $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs; } delete $WriteMakefileArgs{CONFIGURE_REQUIRES} |