Apply E-MM patch from upstream

view Perl-Toolchain-Gang/ExtUtils-MakeMaker@6e58499
atoomic · Aug 3, 2020 · fd89fe2 · fd89fe2
1 parent d19f643
commit fd89fe2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -132,7 +132,10 @@ like( $ppd_html, qr{^\s*<REQUIRE NAME="strict::" />}m,  '  <REQUIRE>' );
 unlike( $ppd_html, qr{^\s*<REQUIRE NAME="warnings::" />}m,  'no <REQUIRE> 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}";
 }