Add BuildRequires: perl(ExtUtils::MakeMaker) when using Makefile.PL.

This commit is contained in:
stevenpritchard committed 2007-03-12 23:00:18 +00:00
1 parent 010de34fe6
commit bc20626239
2 files changed
+5 -3

No files matched your search

+1
View File
@@ -3,6 +3,7 @@
* Delete pm_to_blib if it exists. * Delete pm_to_blib if it exists.
* Don't include the MODULE_COMPAT magic with --old. * Don't include the MODULE_COMPAT magic with --old.
* Exclude *.cfg from %doc. * Exclude *.cfg from %doc.
* Add BuildRequires: perl(ExtUtils::MakeMaker) when using Makefile.PL.
1.69.1 2006-10-16 1.69.1 2006-10-16
+4 -3
View File
@@ -10,7 +10,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# $Id: cpanspec,v 1.44 2007/03/05 18:23:36 stevenpritchard Exp $ # $Id: cpanspec,v 1.45 2007/03/12 23:00:19 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.70'; our $VERSION='1.70';
@@ -836,9 +836,10 @@ for my $file (@args) {
my $usebuildpl=0; my $usebuildpl=0;
if (grep /^Build\.PL$/, @files) { if (grep /^Build\.PL$/, @files) {
# FIXME - I need to figure out how to parse Build.PL.
$build_requires{'Module::Build'}=0; $build_requires{'Module::Build'}=0;
$usebuildpl=1; $usebuildpl=1;
} else {
$build_requires{'ExtUtils::MakeMaker'}=0;
} }
if (!$usebuildpl) { if (!$usebuildpl) {
@@ -935,7 +936,7 @@ END
for my $dep (sort(keys(%build_requires))) { for my $dep (sort(keys(%build_requires))) {
if (exists($Module::CoreList::version{$]}{$dep})) { if (exists($Module::CoreList::version{$]}{$dep})) {
next if (!$compat); next if (!$compat and $dep ne "ExtUtils::MakeMaker");
} elsif ($follow) { } elsif ($follow) {
if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) { if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) {
if (check_dep($dep)) { if (check_dep($dep)) {