Backpatch "Use the preferred version of xsubpp."

As requested this is backpatched all the way to release 8.2.

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index bbb35aec98d617b3ab1956de17f68b2985fe99c4..132863c7033f8b7f5c75d59a32d49ffee09b3e75 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -52,6 +52,9 @@ endif
 # where to find psql for running the tests
 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
 
 
@@ -64,7 +67,7 @@ plperl_opmask.h: plperl_opmask.pl
 
 
 SPI.c: SPI.xs
-       $(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
+       $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 
 # When doing a VPATH build, copy over the .sql and .out files so that the
 # test script can find them.  See comments in src/test/regress/GNUmakefile.

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 2f6696eb7eecc23d9af50ae1e6e6287d1db8d22a..d010fb2e079b3d224f14d3de82f6d26fe471010b 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -12,6 +12,8 @@ use warnings;
 use Project;
 use Solution;
 use Cwd;
+use Config;
+use List::Util qw(first);
 
 use Exporter;
 our (@ISA, @EXPORT_OK);
@@ -91,11 +93,11 @@ sub mkvcbuild
         $plperl->AddDefine('PLPERL_HAVE_UID_GID');
         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";
             system( $solution->{options}->{perl}
                   . '/bin/perl '
-                  . $solution->{options}->{perl}
-                  . '/lib/ExtUtils/xsubpp -typemap '
+                                 . "$xsubppdir/ExtUtils/xsubpp -typemap "
                   . $solution->{options}->{perl}
                   . '/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')