mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backpatch "Use the preferred version of xsubpp."

Browse Source 
As requested this is backpatched all the way to release 8.2.
This commit is contained in:
Andrew Dunstan 2011-11-28 07:45:48 -05:00
parent 9b60e40cad
commit 31e9743f1a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pl/plperl/GNUmakefile
View File

@ -50,6 +50,9 @@ endif
# where to find psql for running the tests # where to find psql for running the tests
PSQLDIR = $(bindir) PSQLDIR = $(bindir)
# where to find xsubpp for building XS.
XSUBPPDIR = $(shell $(PERL) -e 'use List::Util qw(first); print first { -r "$$_/ExtUtils/xsubpp" } @INC')
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
@ -62,7 +65,7 @@ plperl_opmask.h: plperl_opmask.pl
SPI.c: SPI.xs SPI.c: SPI.xs
$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@ $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
install: all installdirs install-lib install: all installdirs install-lib

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

@ -12,6 +12,8 @@ use warnings;
use Project; use Project;
use Solution; use Solution;
use Cwd; use Cwd;
use Config;
use List::Util qw(first);
use Exporter; use Exporter;
our (@ISA, @EXPORT_OK); our (@ISA, @EXPORT_OK);
@ -91,11 +93,11 @@ sub mkvcbuild
$plperl->AddDefine('PLPERL_HAVE_UID_GID'); $plperl->AddDefine('PLPERL_HAVE_UID_GID');
if (Solution::IsNewer('src\pl\plperl\SPI.c','src\pl\plperl\SPI.xs')) if (Solution::IsNewer('src\pl\plperl\SPI.c','src\pl\plperl\SPI.xs'))
{ {
my $xsubppdir = first { -e "$_\\ExtUtils\\xsubpp" } @INC;
print 'Building src\pl\plperl\SPI.c...' . "\n"; print 'Building src\pl\plperl\SPI.c...' . "\n";
system( $solution->{options}->{perl} system( $solution->{options}->{perl}
. '/bin/perl ' . '/bin/perl '
. $solution->{options}->{perl} . "$xsubppdir/ExtUtils/xsubpp -typemap "
. '/lib/ExtUtils/xsubpp -typemap '
. $solution->{options}->{perl} . $solution->{options}->{perl}
. '/lib/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c'); . '/lib/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c');
if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c') if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c')