Skip to content

Commit fd89fe2

Browse files
committed
Apply E-MM patch from upstream
view Perl-Toolchain-Gang/ExtUtils-MakeMaker@6e58499
1 parent d19f643 commit fd89fe2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3232,7 +3232,9 @@ PPD_PERLVERS
32323232
}
32333233

32343234
my $archname = $Config{archname};
3235-
if ("$]" >= 5.008) {
3235+
if( "$]" >= 5.010) {
3236+
$archname .= "-$^V->{version}->[0].$^V->{version}->[1]"; # v5.32.5 => 5.32
3237+
} elsif ("$]" >= 5.008) {
32363238
# archname did not change from 5.6 to 5.8, but those versions may
32373239
# not be not binary compatible so now we append the part of the
32383240
# version that changes when binary compatibility may change

cpan/ExtUtils-MakeMaker/t/basic.t

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ like( $ppd_html, qr{^\s*<REQUIRE NAME="strict::" />}m, ' <REQUIRE>' );
132132
unlike( $ppd_html, qr{^\s*<REQUIRE NAME="warnings::" />}m, 'no <REQUIRE> for build_require' );
133133

134134
my $archname = $Config{archname};
135-
if( "$]" >= 5.008 ) {
135+
if( "$]" >= 5.010) {
136+
$archname .= "-$^V->{version}->[0].$^V->{version}->[1]";
137+
}
138+
elsif( "$]" >= 5.008 ) {
136139
# XXX This is a copy of the internal logic, so it's not a great test
137140
$archname .= "-$Config{PERL_REVISION}.$Config{PERL_VERSION}";
138141
}

0 commit comments

Comments
 (0)