database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00
Code 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:54:03 -05:00
parent b09fc7c39d
commit 62fa8562ec
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pl/plperl/GNUmakefile
View File

@ -52,6 +52,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
plperl.o: perlchunks.h plperl_opmask.h plperl.o: perlchunks.h plperl_opmask.h
@ -68,11 +71,11 @@ all: all-lib
SPI.c: SPI.xs SPI.c: SPI.xs
@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@ $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
Util.c: Util.xs Util.c: Util.xs
@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
$(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

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

@ -13,6 +13,8 @@ use Project;
use Solution; use Solution;
use Cwd; use Cwd;
use File::Copy; use File::Copy;
use Config;
use List::Util qw(first);
use Exporter; use Exporter;
our (@ISA, @EXPORT_OK); our (@ISA, @EXPORT_OK);
@ -101,11 +103,11 @@ sub mkvcbuild
(my $xsc = $xs) =~ s/\.xs/.c/; (my $xsc = $xs) =~ s/\.xs/.c/;
if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs")) if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs"))
{ {
print "Building $plperlsrc$xsc...\n"; my $xsubppdir = first { -e "$_\\ExtUtils\\xsubpp" } @INC;
print "Building $plperlsrc$xsc...\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 ' . '/lib/ExtUtils/typemap '
. "$plperlsrc$xs " . "$plperlsrc$xs "