Update ExtUtils-MakeMaker to CPAN version 7.72

  [DELTA]

7.72    Fri 14 Mar 10:15:56 GMT 2025

    No changes since v7.71_08

7.71_08 Sat  8 Mar 23:39:43 GMT 2025

    Core fixes:
    - Fixed split_command with multi-line oneliner

    Win32 fixes:
    - Reverted a change from v7.36 to fix RT#144085
    - Win32 Liblist stop false positives on multi-LIB (RT#53676)

    Test fixes:
    - Added Test::Utils::write_file
    - test oneliner with multi-line

    QA fixes:
    - use GHA for all Strawberry, cut down AppVeyor
    - CI parallel build & test on Strawberry
    - CI parallel test on MSVC build (nmake no parallel capability)
    - Add test for PM_FILTER

7.71_07 Wed  5 Mar 21:32:41 GMT 2025

    Core fixes:
    - Liblist work with Config.libpth supporting paths with spaces

    Win32 fixes:
    - Win32 Liblist test for system library

    Test fixes:
    - Added test of XS loading other XS, using C symbols within

7.71_06 Mon  3 Mar 16:40:57 GMT 2025

    BSD fixes:
    - RT#117800 affecting BSD make fixed
    - distmeta and co fixed when using make -j

    QA fixes:
    - Added Windows MSVC-built Perl CI
    - Added Windows Strawberry Perl CI
    - Added FreeBSD CI

7.71_05 Fri 28 Feb 16:53:16 GMT 2025

    Enhancements:
    - Reinstated %Recognized_Att_Keys

    Win32 fixes:
    - GNU Make supports spaces in deps on Win32 as elsewhere

    Test fixes:
    - Various improvements to MakeMaker::Test::Setup::XS

    QA fixes:
    - Added disttest checks to CI

7.71_04 Mon 24 Feb 15:15:59 GMT 2025

    Doc fixes:
    - Typo fixed in MM_Unix

    Test fixes:
    - execute bit removed from two .t files

    QA fixes:
    - removed Travis and non-working macos-11 CI config

7.71_03 Wed 19 Feb 01:11:31 GMT 2025

    VMS fixes:
    - Avoid uninitialized value in MM_VMS::_fixin_replace_shebang
    - Take care with '.' in init_dirscan on VMS

7.71_02 Fri 22 Nov 18:37:30 GMT 2024

    Core Fixes:
    - maybe_command() now handles an undefined or empty argument

    Macosx fixes:
    - rpath requires a minimum of Darwin 9
    - Fix rpath issue on MacOSX, it only accepts a single path

    Doc fixes:
    - typos were squashed

    Removals:
    - Removed support for NeXT
    - Removed support for GNU DLD

7.71_01 Mon 24 Jun 15:08:55 BST 2024

    Core fixes:
    - Set META status as "unstable" for -TRIAL releases

    Test fixes:
    - Add DISTVNAME to tests

Author: bingos

MANIFEST

@@ -1110,6 +1110,7 @@ cpan/ExtUtils-MakeMaker/t/prereq.t						See if MakeMaker works
 cpan/ExtUtils-MakeMaker/t/prereq_print.t					See if PREREQ_PRINT works
 cpan/ExtUtils-MakeMaker/t/problems.t						How MakeMaker reacts to build problems
 cpan/ExtUtils-MakeMaker/t/prompt.t						See if E::MM::prompt() works
+cpan/ExtUtils-MakeMaker/t/rec_att_keys.t
 cpan/ExtUtils-MakeMaker/t/recurs.t						See if recursive builds work
 cpan/ExtUtils-MakeMaker/t/revision.t						See if $Revision is correct
 cpan/ExtUtils-MakeMaker/t/several_authors.t					See if multiple AUTHORs work

Porting/Maintainers.pl

@@ -495,7 +495,7 @@ package Maintainers;
     },
 
     'ExtUtils::MakeMaker' => {
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.70.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.72.tar.gz',
         'SYNCINFO'     => 'yorton on Sun Mar 26 16:20:23 2023',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [

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

@@ -7,7 +7,7 @@ require Exporter;
 our @ISA     = qw(Exporter);
 our @EXPORT  = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
                   dos2unix);
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 my $Is_VMS   = $^O eq 'VMS';

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

@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
 
 our @EXPORT  = qw(test_harness pod2man perllocal_install uninstall
                   warn_if_old_packlist test_s cp_nonempty);
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 my $Is_VMS = $^O eq 'VMS';

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

@@ -3,7 +3,7 @@ package ExtUtils::Liblist;
 use strict;
 use warnings;
 
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 use File::Spec;

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

@@ -11,7 +11,7 @@ use 5.006;
 
 use strict;
 use warnings;
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 use ExtUtils::MakeMaker::Config;
@@ -20,9 +20,29 @@ use File::Basename;
 use File::Spec;
 
 sub ext {
-    if    ( $^O eq 'VMS' )     { return &_vms_ext; }
-    elsif ( $^O eq 'MSWin32' ) { return &_win32_ext; }
-    else                       { return &_unix_os2_ext; }
+    if    ( $^O eq 'VMS' )     { goto &_vms_ext; }
+    elsif ( $^O eq 'MSWin32' ) { goto &_win32_ext; }
+    else                       { goto &_unix_os2_ext; }
+}
+
+sub _space_dirs_split {
+  my ($libpth) = @_;
+  return if !length $libpth;
+  my (@chunks, @ret);
+  push @chunks, [$1,$2] while $libpth =~ /(\S+)(\s*)/g;
+  CHUNK: while (@chunks) {
+    my ($c, $ind) = (shift(@chunks), 0);
+    if (-d $c->[0]) { push @ret, $c->[0]; next CHUNK; }
+    my $sofar = join '', @$c;
+    while ($ind < @chunks) {
+      my ($this_word, $this_space) = @{ $chunks[$ind] };
+      $sofar .= $this_word;
+      if (-d $sofar) { push @ret, $sofar; next CHUNK; }
+      $sofar .= $this_space;
+      $ind++;
+    }
+  }
+  @ret;
 }
 
 sub _unix_os2_ext {
@@ -51,20 +71,20 @@ sub _unix_os2_ext {
 
     require Text::ParseWords;
 
-    my ( @searchpath );    # from "-L/path" entries in $potential_libs
-    my ( @libpath ) = Text::ParseWords::shellwords( $Config{'libpth'} || '' );
+    my @searchpath;    # from "-L/path" entries in $potential_libs
+    my @libpath = _space_dirs_split($Config{libpth} || '');
     my ( @ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen );
     my ( @libs,       %libs_seen );
     my ( $fullname,   @fullname );
     my ( $pwd )   = cwd();    # from Cwd.pm
     my ( $found ) = 0;
-	if ($Config{gccversion}) {
-		chomp(my @incpath = grep s/^ //, grep { /^#include </ .. /^End of search / } `$Config{cc} -E -v - </dev/null 2>&1 >/dev/null`);
-		unshift @libpath, map { s{/include[^/]*}{/lib}; $_ } @incpath
-	}
-	@libpath = grep -d, @libpath;
+    if ($Config{gccversion}) {
+        chomp(my @incpath = grep s/^ //, grep { /^#include </ .. /^End of search / } `$Config{cc} -E -v - </dev/null 2>&1 >/dev/null`);
+        unshift @libpath, map { s{/include[^/]*}{/lib}; $_ } @incpath
+    }
+    @libpath = grep -d, @libpath;
 
-    if ( $^O eq 'darwin' or $^O eq 'next' )  {
+    if ($^O eq 'darwin')  {
         # 'escape' Mach-O ld -framework and -F flags, so they aren't dropped later on
         $potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
         $potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
@@ -164,8 +184,7 @@ sub _unix_os2_ext {
                       } @fullname
                 )[0];
             }
-            elsif ( -f ( $fullname = "$thispth/lib$thislib.$so" )
-                && ( ( $Config{'dlsrc'} ne "dl_dld.xs" ) || ( $thislib eq "m" ) ) )
+            elsif ( -f ( $fullname = "$thispth/lib$thislib.$so" ) )
             {
             }
             elsif (-f ( $fullname = "$thispth/lib${thislib}_s$Config_libext" )
@@ -233,42 +252,18 @@ sub _unix_os2_ext {
 
             # Do not add it into the list if it is already linked in
             # with the main perl executable.
-            # We have to special-case the NeXT, because math and ndbm
-            # are both in libsys_s
-            unless (
-                $in_perl
-                || ( $Config{'osname'} eq 'next'
-                    && ( $thislib eq 'm' || $thislib eq 'ndbm' ) )
-              )
-            {
-                push( @extralibs, "-l$custom_name$thislib" );
-            }
+            push( @extralibs, "-l$custom_name$thislib" )
+                unless $in_perl;
 
-            # We might be able to load this archive file dynamically
-            if (   ( $Config{'dlsrc'} =~ /dl_next/ && $Config{'osvers'} lt '4_0' )
-                || ( $Config{'dlsrc'} =~ /dl_dld/ ) )
-            {
+            if ( $is_dyna ) {
 
-                # We push -l$thislib instead of $fullname because
-                # it avoids hardwiring a fixed path into the .bs file.
-                # Mkbootstrap will automatically add dl_findfile() to
-                # the .bs file if it sees a name in the -l format.
-                # USE THIS, when dl_findfile() is fixed:
-                # push(@bsloadlibs, "-l$thislib");
-                # OLD USE WAS while checking results against old_extliblist
-                push( @bsloadlibs, "$fullname" );
+                # For SunOS4, do not add in this shared library if
+                # it is already linked in the main perl executable
+                push( @ldloadlibs, "-l$custom_name$thislib" )
+                  unless ( $in_perl and $^O eq 'sunos' );
             }
             else {
-                if ( $is_dyna ) {
-
-                    # For SunOS4, do not add in this shared library if
-                    # it is already linked in the main perl executable
-                    push( @ldloadlibs, "-l$custom_name$thislib" )
-                      unless ( $in_perl and $^O eq 'sunos' );
-                }
-                else {
-                    push( @ldloadlibs, "-l$custom_name$thislib" );
-                }
+                push( @ldloadlibs, "-l$custom_name$thislib" );
             }
             last;    # found one here so don't bother looking further
         }
@@ -378,19 +373,9 @@ sub _win32_ext {
 
 sub _win32_make_lib_search_list {
     my ( $potential_libs, $verbose ) = @_;
-
-    # If Config.pm defines a set of default libs, we always
-    # tack them on to the user-supplied list, unless the user
-    # specified :nodefault
-    my $libs = $Config{'perllibs'};
-    $potential_libs = join( ' ', $potential_libs, $libs ) if $libs and $potential_libs !~ /:nodefault/i;
     _debug( "Potential libraries are '$potential_libs':\n", $verbose );
-
     $potential_libs =~ s,\\,/,g;    # normalize to forward slashes
-
-    my @list = Text::ParseWords::quotewords( '\s+', 0, $potential_libs );
-
-    return @list;
+    Text::ParseWords::quotewords( '\s+', 0, $potential_libs );
 }
 
 sub _win32_default_search_paths {
@@ -399,11 +384,12 @@ sub _win32_default_search_paths {
     my $libpth = $Config{'libpth'} || '';
     $libpth =~ s,\\,/,g;            # normalize to forward slashes
 
-    my @libpath = Text::ParseWords::quotewords( '\s+', 0, $libpth );
+    my @libpath = _space_dirs_split($libpth);
     push @libpath, "$Config{installarchlib}/CORE";    # add "$Config{installarchlib}/CORE" to default search path
 
     push @libpath, split /;/, $ENV{LIB}          if $VC and $ENV{LIB};
     push @libpath, split /;/, $ENV{LIBRARY_PATH} if $GC and $ENV{LIBRARY_PATH};
+    push @libpath, "$ENV{SYSTEMROOT}\\system32"  if $ENV{SYSTEMROOT};
 
     return @libpath;
 }
@@ -460,8 +446,8 @@ sub _win32_try_attach_extension {
 }
 
 sub _win32_lib_extensions {
-    my @extensions;
-    push @extensions, $Config{'lib_ext'} if $Config{'lib_ext'};
+    my @extensions = grep $_, @Config{qw(lib_ext)};
+    push @extensions, map ".$_", grep $_, @Config{qw(dlext so)};
     push @extensions, '.dll.a' if grep { m!^\.a$! } @extensions;
     push @extensions, '.lib' unless grep { m!^\.lib$! } @extensions;
     return \@extensions;

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

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker::Config;
 
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::Liblist;

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

@@ -2,7 +2,7 @@ package ExtUtils::MM_AIX;
 
 use strict;
 use warnings;
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 use ExtUtils::MakeMaker::Config;

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

@@ -2,7 +2,7 @@ package ExtUtils::MM_Any;
 
 use strict;
 use warnings;
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;
 
 use Carp;
@@ -225,7 +225,7 @@ sub is_make_type {
         if $type eq 'gmake' and $minus_v =~ /GNU make/i;
     return $maketype2true{$type} = 1
         if $type eq 'bsdmake'
-      and $minus_v =~ /^usage: make \[-BeikNnqrstWwX\]/im;
+      and $minus_v =~ /^usage:.*make\s*\[-B/im;
     $maketype2true{$type} = 0; # it wasn't whatever you asked
 }
 
@@ -287,7 +287,8 @@ the args.  Collectively they will process all the arguments.  Each
 individual line in @cmds will not be longer than the
 $self->max_exec_len being careful to take into account macro expansion.
 
-$cmd should include any switches and repeated initial arguments.
+$cmd should include any switches and repeated initial arguments. If it
+has newlines, they should be already escaped.
 
 If no @args are given, no @cmds will be returned.
 
@@ -334,7 +335,7 @@ sub split_command {
         }
         chop $arg_str;
 
-        push @cmds, $self->escape_newlines("$cmd \n$arg_str");
+        push @cmds, $cmd . $self->escape_newlines(" \n$arg_str");
     } while @args;
 
     return @cmds;
@@ -520,7 +521,7 @@ bareword. For example:
     # Assign the value of the $(VERSION_FROM) make macro to $vf.
     $oneliner = $MM->oneliner('$vf = "$(VERSION_FROM)"');
 
-Its currently very simple and may be expanded sometime in the figure
+It's currently very simple, and may be expanded sometime in the future
 to include more flexible code and switches.
 
 
@@ -1302,7 +1303,8 @@ sub metafile_data {
     $meta_merge ||= {};
 
     my $version = _normalize_version($self->{VERSION});
-    my $release_status = ($version =~ /_/) ? 'unstable' : 'stable';
+    my $unstable = $version =~ /_/ || $self->{DISTVNAME} =~ /-TRIAL\d*$/;
+    my $release_status = $unstable ? 'unstable' : 'stable';
     my %meta = (
         # required
         abstract     => $self->{ABSTRACT} || 'unknown',
@@ -2431,13 +2433,12 @@ sub init_others {
     $self->{LIBS} = $self->_fix_libs($self->{LIBS});
 
     # Compute EXTRALIBS, BSLOADLIBS and LDLOADLIBS from $self->{LIBS}
-    foreach my $libs ( @{$self->{LIBS}} ){
+    foreach my $libs ( @{$self->{LIBS}} ) {
         $libs =~ s/^\s*(.*\S)\s*$/$1/; # remove leading and trailing whitespace
-        my(@libs) = $self->extliblist($libs);
-        if ($libs[0] or $libs[1] or $libs[2]){
+        my @libs = $self->extliblist($libs);
+        if (grep $_, @libs[0..2]) {
             # LD_RUN_PATH now computed by ExtUtils::Liblist
-            ($self->{EXTRALIBS},  $self->{BSLOADLIBS},
-             $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
+            @$self{qw(EXTRALIBS BSLOADLIBS LDLOADLIBS LD_RUN_PATH)} = @libs;
             last;
         }
     }
@@ -2498,6 +2499,10 @@ sub tools_other {
     my($self) = shift;
     my @m;
 
+    my $is_nmake = $self->is_make_type('nmake');
+    push @m, <<'EOF' if $is_nmake;
+EUMM_NMAKE_HASH = ^# # to get hash character into strings - yes, horrible
+EOF
     # We set PM_FILTER as late as possible so it can see all the earlier
     # on macro-order sensitive makes such as nmake.
     for my $tool (qw{ SHELL CHMOD CP MV NOOP NOECHO RM_F RM_RF TEST_F TOUCH
@@ -2514,8 +2519,14 @@ sub tools_other {
                       CP_NONEMPTY
                     } )
     {
-        next unless defined $self->{$tool};
-        push @m, "$tool = $self->{$tool}\n";
+        next unless defined(my $value = $self->{$tool});
+        # https://learn.microsoft.com/en-us/cpp/build/reference/contents-of-a-makefile?view=msvc-170#special-characters-in-a-makefile
+        if ($is_nmake) {
+          $value =~ s/#/\$(EUMM_NMAKE_HASH)/g
+        } else {
+          $value =~ s/#/\\#/g
+        }
+        push @m, "$tool = $value\n";
     }
 
     return join "", @m;

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

@@ -27,7 +27,7 @@ require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '7.70';
+our $VERSION = '7.72';
 $VERSION =~ tr/_//d;