From fd89fe2c59ea5301ab3fa79ab67a3eafe315a66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=A2=20=E2=84=95icolas=20=E2=84=9D?= Date: Sun, 2 Aug 2020 20:26:27 -0600 Subject: [PATCH] Apply E-MM patch from upstream view https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/commit/6e58499d41bfbcdced1a1d6690dda20661d41b41 --- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 4 +++- cpan/ExtUtils-MakeMaker/t/basic.t | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index ce1292740f..04144b2042 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -3232,7 +3232,9 @@ PPD_PERLVERS } my $archname = $Config{archname}; - if ("$]" >= 5.008) { + if( "$]" >= 5.010) { + $archname .= "-$^V->{version}->[0].$^V->{version}->[1]"; # v5.32.5 => 5.32 + } elsif ("$]" >= 5.008) { # archname did not change from 5.6 to 5.8, but those versions may # not be not binary compatible so now we append the part of the # version that changes when binary compatibility may change diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t index 7c87c75212..0346dfaedd 100644 --- a/cpan/ExtUtils-MakeMaker/t/basic.t +++ b/cpan/ExtUtils-MakeMaker/t/basic.t @@ -132,7 +132,10 @@ like( $ppd_html, qr{^\s*}m, ' ' ); unlike( $ppd_html, qr{^\s*}m, 'no for build_require' ); my $archname = $Config{archname}; -if( "$]" >= 5.008 ) { +if( "$]" >= 5.010) { + $archname .= "-$^V->{version}->[0].$^V->{version}->[1]"; +} +elsif( "$]" >= 5.008 ) { # XXX This is a copy of the internal logic, so it's not a great test $archname .= "-$Config{PERL_REVISION}.$Config{PERL_VERSION}"; }