database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-25 01:02:05 +03:00
Code Activity

Use the preferred version of xsubpp, not necessarily the one that came with the

Browse Source 
distro version of perl.

David Wheeler and Alex Hunsaker.

Backpatch to 9.1 where it applies cleanly. A simple workaround is available for earlier
branches, and further effort doesn't seem warranted.
This commit is contained in:
Andrew Dunstan
2011-11-26 15:22:32 -05:00
parent 5966bcecf6
commit ba00ab0b11
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pl/plperl/GNUmakefile
View File

@ -55,6 +55,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_helpers.h plperl.o: perlchunks.h plperl_opmask.h plperl_helpers.h
@ -71,11 +74,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 install-lib install-data install: all install-lib install-data

5
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);
@ -106,11 +108,12 @@ 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"))
{ {
my $xsubppdir = first { -e "$_\\ExtUtils\\xsubpp.BAT" } @INC;
print "Building $plperlsrc$xsc...\n"; print "Building $plperlsrc$xsc...\n";
system( $solution->{options}->{perl} system( $solution->{options}->{perl}
. '/bin/perl ' . '/bin/perl '
. $solution->{options}->{perl} . $solution->{options}->{perl}
. '/lib/ExtUtils/xsubpp -typemap ' . "$xsubppdir/ExtUtils/xsubpp -typemap "
. $solution->{options}->{perl} . $solution->{options}->{perl}
. '/lib/ExtUtils/typemap ' . '/lib/ExtUtils/typemap '
. "$plperlsrc$xs " . "$plperlsrc$xs "