[perl.git] branch blead, updated. v5.21.6-84-g6544e9b

[Chris 'Bingos' Williams]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/6544e9b1a671b734ac69d3815ee779a1251412d8?hp=e71417e415af4699d56467e02c623bdc01a490cd>

- Log -----------------------------------------------------------------
commit 6544e9b1a671b734ac69d3815ee779a1251412d8
Author: Chris 'BinGOs' Williams <***@bingosnet.co.uk>
Date: Mon Nov 24 22:33:43 2014 +0000

Dmake's -v means verbose not version

As Steve said in a500b25a5 there was a bug somewhere.

dmake -v was being run which translates to 'dmake -f Makefile all'
but with verbosity.

Oops.

Upstreamed to EUMM repository.
-----------------------------------------------------------------------

Summary of changes:
Porting/Maintainers.pl | 1 +
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 3 ++-
t/porting/customized.dat | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 748ba73..ff8b262 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -488,6 +488,7 @@ use File::Glob qw(:case);
'CUSTOMIZED' => [
# Applied upstream
q(lib/ExtUtils/MM_Unix.pm),
+ q(lib/ExtUtils/MM_Any.pm),
],
},

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index 9b86c2c..96edfa6 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -205,7 +205,8 @@ Returns true if C<<$self->make>> is the given type; possibilities are:
sub is_make_type {
my($self, $type) = @_;
(undef, undef, my $make_basename) = $self->splitpath($self->make);
- return 1 if $make_basename =~ /\b$type\b/; # executable's filename
+ return 1 if $make_basename =~ /\b$type\b/i; # executable's filename
+ return 0 if $make_basename =~ /\bdmake\b/i; # Never fall through for dmake
# now have to run with "-v" and guess
my $redirect = $self->can_redirect_error ? '2>&1' : '';
my $make = $self->make || $self->{MAKE};
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 407f0ab..4f7f35f 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,6 +1,7 @@
DB_File cpan/DB_File/DB_File.xs f364b661bbb0df075b0c425b104577e7176fe82b
Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e
+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 5ff15de1269f618d8e3b22626568ea97d596de77
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 793813932194c12e62c6046f62ea6f1fb65de80b
IO::Socket::IP cpan/IO-Socket-IP/t/22timeout.t 0a65d4ca44663f70eea3c7f1ccb5faed2940611f
PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691

--
Perl5 Master Repository

[Steve Hay]

Post by Chris 'Bingos' Williams
In perl.git, the branch blead has been updated
<

http://perl5.git.perl.org/perl.git/commitdiff/6544e9b1a671b734ac69d3815ee779a1251412d8?hp=e71417e415af4699d56467e02c623bdc01a490cd

Post by Chris 'Bingos' Williams
- Log -----------------------------------------------------------------
commit 6544e9b1a671b734ac69d3815ee779a1251412d8
Date: Mon Nov 24 22:33:43 2014 +0000
Dmake's -v means verbose not version
As Steve said in a500b25a5 there was a bug somewhere.
dmake -v was being run which translates to 'dmake -f Makefile all'
but with verbosity.
Oops.
Upstreamed to EUMM repository.
-----------------------------------------------------------------------

Excellent! Thank you for chasing that one down.