Search for versioned perl library instead of using hardcoded name on Windows. Backpatch to release 8.3

adunstan · adunstan · commit 8b78428fc0a6 · 2009-06-05T18:29:56.000Z
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.36 2008/10/02 08:11:11 petere Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.37 2009/06/05 18:29:56 adunstan Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -19,7 +19,8 @@ ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
 ifeq ($(PORTNAME), win32)
 perl_archlibexp := $(subst \,/,$(perl_archlibexp))
 perl_privlibexp := $(subst \,/,$(perl_privlibexp))
-perl_embed_ldflags = -L$(perl_archlibexp)/CORE -lperl58
+perl_lib := $(basename $(notdir $(wildcard $(perl_archlibexp)/CORE/perl[5-9]*.lib)))
+perl_embed_ldflags = -L$(perl_archlibexp)/CORE -l$(perl_lib)
 override CPPFLAGS += -DPLPERL_HAVE_UID_GID
 # Perl on win32 contains /* within comment all over the header file,
 # so disable this warning.
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.40 2009/06/05 18:29:56 adunstan Exp $
 #
 use Carp;
 use Win32;
@@ -104,14 +104,16 @@ sub mkvcbuild
             }
         }
         $plperl->AddReference($postgres);
-        if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
+		my @perl_libs = grep {/perl\d+.lib$/ }
+			glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
+        if (@perl_libs == 1)
         {
-            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');
-        }
-        else
-        {
-            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+            $plperl->AddLibrary($perl_libs[0]);
         }
+		else
+		{
+			die "could not identify perl library version";
+		}
     }
 
     if ($solution->{options}->{python})

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.40 2009/06/05 18:29:56 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -104,14 +104,16 @@ sub mkvcbuild`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`$plperl->AddReference($postgres);`
`107`		`- if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')`
	`107`	`+ my @perl_libs = grep {/perl\d+.lib$/ }`
	`108`	`+ glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');`
	`109`	`+ if (@perl_libs == 1)`
`108`	`110`	`{`
`109`		`- $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');`
`110`		`- }`
`111`		`- else`
`112`		`- {`
`113`		`- $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');`
	`111`	`+ $plperl->AddLibrary($perl_libs[0]);`
`114`	`112`	`}`
	`113`	`+ else`
	`114`	`+ {`
	`115`	`+ die "could not identify perl library version";`
	`116`	`+ }`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`if ($solution->{options}->{python})`