Attachment #290015 for bug #378865




# where to find psql for running the tests
PSQLDIR = $(bindir)

# where to find xsubpp for building XS.
XSUBPPDIR = $(shell $(PERL) -MConfig -e 'use List::Util qw(first); print first { -x "$$_/xsubpp" } @Config{qw(installsitebin installvendorbin installbin)}')

include $(top_srcdir)/src/Makefile.shlib

plperl.o: perlchunks.h plperl_opmask.h

all: all-lib

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

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


install: all install-lib install-data

Lines 13-18 use Project; Link Here

(-)a/src/tools/msvc/Mkvcbuild.pm (-1 / +5 lines)
13	use Solution;	13	use Solution;
14	use Cwd;	14	use Cwd;
15	use File::Copy;	15	use File::Copy;
		16	use Config;
		17	use List::Util qw(first);
16		18
17	use Exporter;	19	use Exporter;
18	our (@ISA, @EXPORT_OK);	20	our (@ISA, @EXPORT_OK);
Lines 106-116 sub mkvcbuild Link Here
106	(my $xsc = $xs) =~ s/\.xs/.c/;	108	(my $xsc = $xs) =~ s/\.xs/.c/;
107	if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs"))	109	if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs"))
108	{	110	{
		111	my $xsubppdir = first { -e "$_\\xsubpp.BAT" }
		112	@Config{qw(installsitebin installvendorbin installbin)};
109	print "Building $plperlsrc$xsc...\n";	113	print "Building $plperlsrc$xsc...\n";
110	system( $solution->{options}->{perl}	114	system( $solution->{options}->{perl}
111	. '/bin/perl '	115	. '/bin/perl '
112	. $solution->{options}->{perl}	116	. $solution->{options}->{perl}
113	. '/lib/ExtUtils/xsubpp -typemap '	117	. "$xsubppdir/xsubpp -typemap "
114	. $solution->{options}->{perl}	118	. $solution->{options}->{perl}
115	. '/lib/ExtUtils/typemap '	119	. '/lib/ExtUtils/typemap '
116	. "$plperlsrc$xs "	120	. "$plperlsrc$xs "

Return to bug 378865

Lines 55-60 endif Link Here

(-)a/src/pl/plperl/GNUmakefile (-4 / +7 lines)
55	# where to find psql for running the tests	55	# where to find psql for running the tests
56	PSQLDIR = $(bindir)	56	PSQLDIR = $(bindir)
57		57
		58	# where to find xsubpp for building XS.
		59	XSUBPPDIR = $(shell $(PERL) -MConfig -e 'use List::Util qw(first); print first { -x "$$_/xsubpp" } @Config{qw(installsitebin installvendorbin installbin)}')
		60
58	include $(top_srcdir)/src/Makefile.shlib	61	include $(top_srcdir)/src/Makefile.shlib
59		62
60	plperl.o: perlchunks.h plperl_opmask.h	63	plperl.o: perlchunks.h plperl_opmask.h
Lines 70-81 perlchunks.h: $(PERLCHUNKS) Link Here
70	all: all-lib	73	all: all-lib
71		74
72	SPI.c: SPI.xs	75	SPI.c: SPI.xs
73	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi	76	@if [ x"$(XSUBPPDIR)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
74	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@	77	$(PERL) $(XSUBPPDIR)/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
75		78
76	Util.c: Util.xs	79	Util.c: Util.xs
77	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi	80	@if [ x"$(XSUBPPDIR)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
78	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@	81	$(PERL) $(XSUBPPDIR)/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
79		82
80		83
81	install: all install-lib install-data	84	install: all install-lib install-data