| Subject: | Sync with blead |
The attached patch syncs 6.87_04 with blead (re: d59900f697 and 8aaffb9f45).
| Subject: | blead.patch |
diff -ruN ExtUtils-MakeMaker-6.87_04.orig/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.87_04/lib/ExtUtils/MM_Any.pm
--- ExtUtils-MakeMaker-6.87_04.orig/lib/ExtUtils/MM_Any.pm 2014-01-26 19:30:44.000000000 +0000
+++ ExtUtils-MakeMaker-6.87_04/lib/ExtUtils/MM_Any.pm 2014-01-28 13:25:52.557866600 +0000
@@ -1633,14 +1633,7 @@
# you to build directly into, say $Config{privlibexp}.
unless ($self->{INST_LIB}){
if ($self->{PERL_CORE}) {
- if (defined $Cross::platform) {
- $self->{INST_LIB} = $self->{INST_ARCHLIB} =
- $self->catdir($self->{PERL_LIB},"..","xlib",
- $Cross::platform);
- }
- else {
- $self->{INST_LIB} = $self->{INST_ARCHLIB} = $self->{PERL_LIB};
- }
+ $self->{INST_LIB} = $self->{INST_ARCHLIB} = $self->{PERL_LIB};
} else {
$self->{INST_LIB} = $self->catdir($Curdir,"blib","lib");
}
diff -ruN ExtUtils-MakeMaker-6.87_04.orig/lib/ExtUtils/MM_Unix.pm ExtUtils-MakeMaker-6.87_04/lib/ExtUtils/MM_Unix.pm
--- ExtUtils-MakeMaker-6.87_04.orig/lib/ExtUtils/MM_Unix.pm 2014-01-26 19:30:44.000000000 +0000
+++ ExtUtils-MakeMaker-6.87_04/lib/ExtUtils/MM_Unix.pm 2014-01-28 13:25:22.537866600 +0000
@@ -1044,8 +1044,6 @@
print "Executing $abs\n" if ($trace >= 2);
my $version_check = qq{$abs -le "require $ver; print qq{VER_OK}"};
- $version_check = "$Config{run} $version_check"
- if defined $Config{run} and length $Config{run};
# To avoid using the unportable 2>&1 to suppress STDERR,
# we close it before running the command.
@@ -1642,18 +1640,9 @@
if ($self->{PERL_SRC}){
$self->{PERL_LIB} ||= $self->catdir("$self->{PERL_SRC}","lib");
- if (defined $Cross::platform) {
- $self->{PERL_ARCHLIB} =
- $self->catdir("$self->{PERL_SRC}","xlib",$Cross::platform);
- $self->{PERL_INC} =
- $self->catdir("$self->{PERL_SRC}","xlib",$Cross::platform,
- $Is{Win32}?("CORE"):());
- }
- else {
- $self->{PERL_ARCHLIB} = $self->{PERL_LIB};
- $self->{PERL_INC} = ($Is{Win32}) ?
- $self->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC};
- }
+ $self->{PERL_ARCHLIB} = $self->{PERL_LIB};
+ $self->{PERL_INC} = ($Is{Win32}) ?
+ $self->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC};
# catch a situation that has occurred a few times in the past:
unless (