Test, fix override of subdir top_targets to "all : static"

Author: mohawk2

lib/ExtUtils/MM_Unix.pm

@@ -992,7 +992,14 @@ sub xs_make_dynamic_lib {
     my ($self, $attribs, $from, $to, $todir, $ldfrom, $exportlist) = @_;
     $exportlist = '' if $exportlist ne '$(EXPORT_LIST)';
     my $armaybe = $self->_xs_armaybe($attribs);
-    my @m = sprintf '%s : %s $(MYEXTLIB) %s$(DFSEP).exists %s $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)'."\n", $to, $from, $todir, $exportlist;
+    # if there are subdirs and MYEXTLIB looks relative ie in a subdir and
+    # looks like a static library, heuristic to ensure MYEXTLIB gets built
+    my $subdirs_static = '';
+    $subdirs_static = 'subdirs_static'
+        if $self->{MYEXTLIB} &&
+        (File::Spec->rel2abs($self->{MYEXTLIB}) ne $self->{MYEXTLIB}) &&
+        $self->{MYEXTLIB} =~ /\Q$self->{LIB_EXT}\E|\$\(LIB_EXT\)\z/;
+    my @m = sprintf '%s : %s $(MYEXTLIB) %s$(DFSEP).exists %s $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP) %s'."\n", $to, $from, $todir, $exportlist, $subdirs_static;
     if ($armaybe ne ':'){
         $ldfrom = 'tmp$(LIB_EXT)';
         push(@m,'	$(ARMAYBE) cr '.$ldfrom.' $(OBJECT)'."\n");
@@ -3579,11 +3586,12 @@ sub subdirs {
 ####	print "Including $dir subdirectory\n";
     }
     if (@m){
-	unshift(@m, "
+	unshift @m, <<'EOF';
+
 # The default clean, realclean and test targets in this Makefile
 # have automatically been given entries for each subdir.
 
-");
+EOF
     } else {
 	push(@m, "\n# none")
     }

t/lib/MakeMaker/Test/Setup/XS.pm

@@ -194,6 +194,61 @@ $label2files{staticmulti} = +{
   ),
 };
 
+# mimic scheme in Archive::Unzip::Burst:
+#   MYEXTLIB is res/lib*.a
+#   top-level postamble deps res/unzip/Makefile off MYEXTLIB and builds res/unzip/*.o
+# res/M.PL overrides top_targets with:
+#   "all : static"
+#   "static : lib*.a"
+#   "lib*.a : unzip/*.o -> ar makes lib*.a"
+# this scheme depends on top level subdirs (specifically res's "static")
+# being built before it tries its MYEXTLIB target
+$label2files{subdirsoverride} = +{
+  %{ $label2files{'basic'} }, # make copy
+
+  'Makefile.PL' => sprintf(
+    $MAKEFILEPL, 'Test', 'Test.pm', qq{'$typemap'},
+    q{DEFINE => '-DINVAR=input', MYEXTLIB => 'Other/libover$(LIB_EXT)'},
+  ) . <<'EOF',
+package MY;
+sub postamble {
+  my ($self) = @_;
+  sprintf <<'MAKEFRAG', $self->cd($self->catdir(qw(Other sub)), '$(MAKE)');
+$(MYEXTLIB) :
+	%s
+MAKEFRAG
+}
+EOF
+
+  'Other/Makefile.PL' => sprintf($MAKEFILEPL, 'Other', '../Test.pm', qq{}, '') . <<'EOF',
+package MY;
+sub top_targets {
+  <<'MAKEFRAG';
+all :: static
+static :: libover$(LIB_EXT)
+libover$(LIB_EXT) : sub/notmuch$(OBJ_EXT)
+	$(AR) cr "$@" "$<"
+	$(RANLIB) "$@"
+MAKEFRAG
+}
+EOF
+
+  'Other/sub/Makefile.PL' => sprintf(
+    $MAKEFILEPL, 'Third', '../../Test.pm', qq{}, 'OBJECT => q{$(O_FILES)}'
+  ) . <<'EOF',
+package MY;
+sub top_targets {
+  <<'MAKEFRAG';
+all :: $(O_FILES)
+MAKEFRAG
+}
+EOF
+
+  'Other/sub/notmuch.c' => '',
+
+};
+virtual_rename('subdirsoverride', 'lib/XS/Test.pm', 'Test.pm');
+
 sub virtual_rename {
   my ($label, $oldfile, $newfile) = @_;
   $label2files{$label}->{$newfile} = delete $label2files{$label}->{$oldfile};
@@ -234,6 +289,7 @@ sub list_dynamic {
     [ 'multi', '', '' ],
     [ 'staticmulti', ' LINKTYPE=dynamic', ' LINKTYPE=dynamic' ],
     [ 'staticmulti', ' dynamic', '_dynamic' ],
+    [ 'subdirsoverride', '', '' ],
   );
 }