Skip to content

Commit 1b6aef6

Browse files
bingosbingos
committed
Update Extutils-MakerMaker to CPAN version 7.74
Fixes core builds on VMS 7.74 Wed 9 Apr 13:28:16 BST 2025 No changes since v7.73_01 7.73_01 Sun 30 Mar 11:45:44 BST 2025 Core fixes: - WriteEmptyMakefile now produces the same target types as WriteMakefile VMS fixes: - fixed pm_to_blib regression Macosx fixes: - stop MacOS dropping LIBS=>"-framework X" with no "-l" libs
1 parent 77b8928 commit 1b6aef6

35 files changed

+75
-54
lines changed

‎Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ package Maintainers;
494494
},
495495

496496
'ExtUtils::MakeMaker' => {
497-
'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.72.tar.gz',
497+
'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.74.tar.gz',
498498
'SYNCINFO' => 'yorton on Sun Mar 26 16:20:23 2023',
499499
'FILES' => q[cpan/ExtUtils-MakeMaker],
500500
'EXCLUDED' => [

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require Exporter;
77
our @ISA = qw(Exporter);
88
our @EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
99
dos2unix);
10-
our $VERSION = '7.72';
10+
our $VERSION = '7.74';
1111
$VERSION =~ tr/_//d;
1212

1313
my $Is_VMS = $^O eq 'VMS';

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
1010

1111
our @EXPORT = qw(test_harness pod2man perllocal_install uninstall
1212
warn_if_old_packlist test_s cp_nonempty);
13-
our $VERSION = '7.72';
13+
our $VERSION = '7.74';
1414
$VERSION =~ tr/_//d;
1515

1616
my $Is_VMS = $^O eq 'VMS';

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::Liblist;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
use File::Spec;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use 5.006;
1111

1212
use strict;
1313
use warnings;
14-
our $VERSION = '7.72';
14+
our $VERSION = '7.74';
1515
$VERSION =~ tr/_//d;
1616

1717
use ExtUtils::MakeMaker::Config;
@@ -86,8 +86,8 @@ sub _unix_os2_ext {
8686

8787
if ($^O eq 'darwin') {
8888
# 'escape' Mach-O ld -framework and -F flags, so they aren't dropped later on
89-
$potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
90-
$potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
89+
$found++ if $potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
90+
$found++ if $potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
9191
}
9292

9393
foreach my $thislib ( Text::ParseWords::shellwords($potential_libs) ) {
@@ -271,12 +271,8 @@ sub _unix_os2_ext {
271271
unless $found_lib > 0;
272272
}
273273

274-
unless ( $found ) {
275-
return ( '', '', '', '', ( $give_libs ? \@libs : () ) );
276-
}
277-
else {
278-
return ( "@extralibs", "@bsloadlibs", "@ldloadlibs", join( ":", @ld_run_path ), ( $give_libs ? \@libs : () ) );
279-
}
274+
return ( '', '', '', '', ( $give_libs ? \@libs : () ) ) unless $found;
275+
( "@extralibs", "@bsloadlibs", "@ldloadlibs", join( ":", @ld_run_path ), ( $give_libs ? \@libs : () ) );
280276
}
281277

282278
sub _win32_ext {

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use strict;
44
use warnings;
55
use ExtUtils::MakeMaker::Config;
66

7-
our $VERSION = '7.72';
7+
our $VERSION = '7.74';
88
$VERSION =~ tr/_//d;
99

1010
require ExtUtils::Liblist;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_AIX;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
use ExtUtils::MakeMaker::Config;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_Any;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
use Carp;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require ExtUtils::MM_Any;
2727
require ExtUtils::MM_Unix;
2828

2929
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
30-
our $VERSION = '7.72';
30+
our $VERSION = '7.74';
3131
$VERSION =~ tr/_//d;
3232

3333

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require ExtUtils::MM_Unix;
1010
require ExtUtils::MM_Win32;
1111
our @ISA = qw( ExtUtils::MM_Unix );
1212

13-
our $VERSION = '7.72';
13+
our $VERSION = '7.74';
1414
$VERSION =~ tr/_//d;
1515

1616

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::MM_DOS;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
require ExtUtils::MM_Any;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BEGIN {
88
our @ISA = qw( ExtUtils::MM_Unix );
99
}
1010

11-
our $VERSION = '7.72';
11+
our $VERSION = '7.74';
1212
$VERSION =~ tr/_//d;
1313

1414

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::MM_MacOS;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
sub new {

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use warnings;
2323
use ExtUtils::MakeMaker::Config;
2424
use File::Basename;
2525

26-
our $VERSION = '7.72';
26+
our $VERSION = '7.74';
2727
$VERSION =~ tr/_//d;
2828

2929
require ExtUtils::MM_Win32;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use warnings;
66
use ExtUtils::MakeMaker qw(neatvalue);
77
use File::Spec;
88

9-
our $VERSION = '7.72';
9+
our $VERSION = '7.74';
1010
$VERSION =~ tr/_//d;
1111

1212
require ExtUtils::MM_Any;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_OS390;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
use ExtUtils::MakeMaker::Config;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_QNX;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
require ExtUtils::MM_Unix;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_UWIN;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
require ExtUtils::MM_Unix;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562);
1515

1616
# If $VERSION is in scope, parse_version() breaks
1717
{
18-
our $VERSION = '7.72';
18+
our $VERSION = '7.74';
1919
$VERSION =~ tr/_//d;
2020
}
2121

@@ -3191,10 +3191,10 @@ pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
31913191

31923192
# VMS will swallow '' and PM_FILTER is often empty. So use q[]
31933193
my $pm_to_blib = $self->oneliner(<<CODE, ['-MExtUtils::Install']);
3194-
\$i=0; \$i++ until \$i > \$#ARGV or \$ARGV[\$i] eq "--";
3195-
die "Failed to find -- in ".join("|",\@ARGV) if \$i > \$#ARGV;
3194+
\$i=0; \$n=\$#ARGV; \$i++ until \$i > \$n or \$ARGV[\$i] eq q{--};
3195+
die q{Failed to find -- in }.join(q{|},\@ARGV) if \$i > \$n;
31963196
\@parts=splice \@ARGV,0,\$i+1;
3197-
pop \@parts; \$filter=join " ", map qq{"\$_"}, \@parts;
3197+
pop \@parts; \$filter=join q{ }, map qq{"\$_"}, \@parts;
31983198
pm_to_blib({\@ARGV}, '$autodir', \$filter, '\$(PERM_DIR)')
31993199
CODE
32003200
$pm_to_blib .= q[ $(PM_FILTER) --];

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BEGIN {
1616

1717
use File::Basename;
1818

19-
our $VERSION = '7.72';
19+
our $VERSION = '7.74';
2020
$VERSION =~ tr/_//d;
2121

2222
require ExtUtils::MM_Any;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MM_VOS;
22

33
use strict;
44
use warnings;
5-
our $VERSION = '7.72';
5+
our $VERSION = '7.74';
66
$VERSION =~ tr/_//d;
77

88
require ExtUtils::MM_Unix;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw(neatvalue _sprintf562);
2727
require ExtUtils::MM_Any;
2828
require ExtUtils::MM_Unix;
2929
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
30-
our $VERSION = '7.72';
30+
our $VERSION = '7.74';
3131
$VERSION =~ tr/_//d;
3232

3333
$ENV{EMXSHELL} = 'sh'; # to run `commands`

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::MM_Win95;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
require ExtUtils::MM_Win32;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::MY;
33
use strict;
44
require ExtUtils::MM;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88
our @ISA = qw(ExtUtils::MM);
99

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ our %Recognized_Att_Keys;
2525
our %macro_fsentity; # whether a macro is a filesystem name
2626
our %macro_dep; # whether a macro is a dependency
2727

28-
our $VERSION = '7.72';
28+
our $VERSION = '7.74';
2929
$VERSION =~ tr/_//d;
3030

3131
# Emulate something resembling CVS $Revision$
@@ -864,27 +864,27 @@ sub WriteEmptyMakefile {
864864
}
865865
open my $mfh, '>', $new or die "open $new for write: $!";
866866
print $mfh <<'EOP';
867-
all :
867+
all ::
868868
869869
manifypods :
870870
871-
subdirs :
871+
subdirs ::
872872
873-
dynamic :
873+
dynamic ::
874874
875-
static :
875+
static ::
876876
877-
clean :
877+
clean ::
878878
879-
install :
879+
install ::
880880
881881
makemakerdflt :
882882
883-
test :
883+
test ::
884884
885-
test_dynamic :
885+
test_dynamic ::
886886
887-
test_static :
887+
test_static ::
888888
889889
EOP
890890
close $mfh or die "close $new for write: $!";

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::MakeMaker::Config;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
use Config ();

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ExtUtils::MakeMaker::FAQ;
22

3-
our $VERSION = '7.72';
3+
our $VERSION = '7.74';
44
$VERSION =~ tr/_//d;
55

66
1;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Locale;
22

33
use strict;
44
use warnings;
5-
our $VERSION = "7.72";
5+
our $VERSION = "7.74";
66
$VERSION =~ tr/_//d;
77

88
use base 'Exporter';

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ExtUtils::MakeMaker::Tutorial;
22

3-
our $VERSION = '7.72';
3+
our $VERSION = '7.74';
44
$VERSION =~ tr/_//d;
55

66

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use warnings;
1616

1717
use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
1818

19-
$VERSION = '7.72';
19+
$VERSION = '7.74';
2020
$VERSION =~ tr/_//d;
2121
$CLASS = 'version';
2222

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use warnings;
1111

1212
use vars qw($VERSION $CLASS $STRICT $LAX);
1313

14-
$VERSION = '7.72';
14+
$VERSION = '7.74';
1515
$VERSION =~ tr/_//d;
1616

1717
#--------------------------------------------------------------------------#

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
require Exporter;

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use Config;
1111

1212
our @ISA = qw(Exporter);
1313
our @EXPORT = qw(&Mksymlists);
14-
our $VERSION = '7.72';
14+
our $VERSION = '7.74';
1515
$VERSION =~ tr/_//d;
1616

1717
sub Mksymlists {

‎cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ExtUtils::testlib;
33
use strict;
44
use warnings;
55

6-
our $VERSION = '7.72';
6+
our $VERSION = '7.74';
77
$VERSION =~ tr/_//d;
88

99
use Cwd;

0 commit comments

Comments
 (0)