diff options
author | Norbert Preining <norbert@preining.info> | 2022-04-04 03:14:42 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-04-04 03:14:42 +0000 |
commit | 7548e4d37c2aaefd32fe0a9bcd83f8e71326dde1 (patch) | |
tree | d335b608e63e9b3c37d7ba0e567c63e77250e171 /systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm | |
parent | 506de1e2d3515161cdbc7018b4ccc9e49d7f86e8 (diff) |
CTAN sync 202204040314
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm')
-rw-r--r-- | systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm b/systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm index ce1292740f..977b50ed02 100644 --- a/systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm +++ b/systems/texlive/tlnet/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm @@ -3,6 +3,7 @@ package ExtUtils::MM_Unix; require 5.006; use strict; +use warnings; use Carp; use ExtUtils::MakeMaker::Config; @@ -14,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562); # If we make $VERSION an our variable parse_version() breaks use vars qw($VERSION); -$VERSION = '7.44'; +$VERSION = '7.62'; $VERSION =~ tr/_//d; require ExtUtils::MM_Any; @@ -3000,7 +3001,7 @@ sub parse_version { chop; next if /^\s*(if|unless|elsif)/; if ( m{^ \s* package \s+ \w[\w\:\']* \s+ (v?[0-9._]+) \s* (;|\{) }x ) { - local $^W = 0; + no warnings; $result = $1; } elsif ( m{(?<!\\) ([\$*]) (([\w\:\']*) \bVERSION)\b .* (?<![<>=!])\=[^=]}x ) { @@ -3018,6 +3019,10 @@ sub parse_version { my $normal = eval { version->new( $result ) }; $result = $normal if defined $normal; } + if ( defined $result ) { + $result = "undef" unless $result =~ m!^v?[\d_\.]+$! + or eval { version->parse( $result ) }; + } $result = "undef" unless defined $result; return $result; } @@ -3033,8 +3038,8 @@ sub get_version { version::->import; }; no strict; + no warnings; local *{$name}; - local $^W = 0; $line = $1 if $line =~ m{^(.+)}s; eval($line); ## no critic return ${$name}; @@ -3232,11 +3237,12 @@ PPD_PERLVERS } my $archname = $Config{archname}; + + # 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 if ("$]" >= 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 - $archname .= "-$Config{PERL_REVISION}.$Config{PERL_VERSION}"; + $archname .= "-$Config{api_revision}.$Config{api_version}"; } push @ppd_chunks, sprintf <<'PPD_OUT', $archname; <ARCHITECTURE NAME="%s" /> @@ -3973,8 +3979,6 @@ sub top_targets { pure_all :: config pm_to_blib subdirs linkext $(NOECHO) $(NOOP) - $(NOECHO) $(NOOP) - subdirs :: $(MYEXTLIB) $(NOECHO) $(NOOP) |