sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-04 00:02:37 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Dunstan 2009-06-05 18:29:56 +00:00
parent 7aace98bf6
commit 8b78428fc0
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pl/plperl/GNUmakefile
View File

@ -1,5 +1,5 @@
# Makefile for PL/Perl # 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 subdir = src/pl/plperl
top_builddir = ../../.. top_builddir = ../../..
@ -19,7 +19,8 @@ ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
perl_archlibexp := $(subst \,/,$(perl_archlibexp)) perl_archlibexp := $(subst \,/,$(perl_archlibexp))
perl_privlibexp := $(subst \,/,$(perl_privlibexp)) 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 override CPPFLAGS += -DPLPERL_HAVE_UID_GID
# Perl on win32 contains /* within comment all over the header file, # Perl on win32 contains /* within comment all over the header file,
# so disable this warning. # so disable this warning.

16
src/tools/msvc/Mkvcbuild.pm
View File

@ -3,7 +3,7 @@ package Mkvcbuild;
# #
# Package that generates build files for msvc build # 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 Carp;
use Win32; use Win32;
@ -104,14 +104,16 @@ sub mkvcbuild
} }
} }
$plperl->AddReference($postgres); $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'); $plperl->AddLibrary($perl_libs[0]);
}
else
{
$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
} }
else
{
die "could not identify perl library version";
}
} }
if ($solution->{options}->{python}) if ($solution->{options}->{python})