Fix msvc builds for ActivePerl > 5.24

mhagander · mhagander · commit 7240962f8626 · 2018-03-02T12:40:49.000+01:00
From this version ActivePerl ships both a .lib and a .a file for the
perl library, which our code would detect as there being no library
available. Instead, we should pick the .lib version and use that.

Report and suggested fix in bug #15065

Author: Heath Lord
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -524,9 +524,11 @@ sub mkvcbuild
 		my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
 
 		# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
+		# Starting with ActivePerl 5.24, both  perlnn.lib and libperlnn.a are provided.
+		# In this case, prefer .lib.
 		my @perl_libs =
 		  grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
-		if (@perl_libs == 1)
+		if (@perl_libs > 0)
 		{
 			$plperl->AddLibrary($perl_libs[0]);
 		}

Original file line number	Diff line number	Diff line change
`@@ -524,9 +524,11 @@ sub mkvcbuild`
`524`	`524`	`my $perl_path = $solution->{options}->{perl} . '\lib\CORE\perl';`
`525`	`525`
`526`	`526`	`# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a`
	`527`	`+ # Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.`
	`528`	`+ # In this case, prefer .lib.`
`527`	`529`	`my @perl_libs =`
`528`	`530`	`grep { /perl\d+\.lib$\|libperl\d+\.a$/ } glob($perl_path);`
`529`		`- if (@perl_libs == 1)`
	`531`	`+ if (@perl_libs > 0)`
`530`	`532`	`{`
`531`	`533`	`$plperl->AddLibrary($perl_libs[0]);`
`532`	`534`	`}`