Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit62fa856

Browse files
committed
Backpatch "Use the preferred version of xsubpp."
As requested this is backpatched all the way to release 8.2.
1 parentb09fc7c commit62fa856

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

‎src/pl/plperl/GNUmakefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ endif
5252
# where to find psql for running the tests
5353
PSQLDIR =$(bindir)
5454

55+
# where to find xsubpp for building XS.
56+
XSUBPPDIR =$(shell$(PERL) -e 'use List::Util qw(first); print first { -r "$$_/ExtUtils/xsubpp" } @INC')
57+
5558
include$(top_srcdir)/src/Makefile.shlib
5659

5760
plperl.o: perlchunks.h plperl_opmask.h
@@ -68,11 +71,11 @@ all: all-lib
6871

6972
SPI.c: SPI.xs
7073
@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi
71-
$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@
74+
$(PERL)$(XSUBPPDIR)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@
7275

7376
Util.c: Util.xs
7477
@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi
75-
$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@
78+
$(PERL)$(XSUBPPDIR)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@
7679

7780
install: all installdirs install-lib
7881

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ use Project;
1313
use Solution;
1414
use Cwd;
1515
use File::Copy;
16+
use Config;
17+
use List::Utilqw(first);
1618

1719
use Exporter;
1820
our (@ISA,@EXPORT_OK);
@@ -101,11 +103,11 @@ sub mkvcbuild
101103
(my$xsc =$xs) =~s/\.xs/.c/;
102104
if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs"))
103105
{
104-
print"Building$plperlsrc$xsc...\n";
106+
my$xsubppdir = first {-e"$_\\ExtUtils\\xsubpp" }@INC;
107+
print"Building$plperlsrc$xsc...\n";
105108
system($solution->{options}->{perl}
106109
.'/bin/perl'
107-
.$solution->{options}->{perl}
108-
.'/lib/ExtUtils/xsubpp -typemap'
110+
."$xsubppdir/ExtUtils/xsubpp -typemap"
109111
.$solution->{options}->{perl}
110112
.'/lib/ExtUtils/typemap'
111113
."$plperlsrc$xs"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp