git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Peter Eisentraut <peter_e@gmx.net>

2017年9月27日 19:51:04 +0000 (15:51 -0400)

committer Peter Eisentraut <peter_e@gmx.net>

2017年9月27日 19:51:04 +0000 (15:51 -0400)

The changes in 639928c988c1c2f52bbe7ca89e8c7c78a041b3e2 turned out to
require Perl 5.9.3, which is newer than our minimum required version.
So revert back to the old code for the normal case and only use the new
variant when both coverage and vpath are used. As the minimum Perl
version moves forward, we can drop the old code sometime.

src/pl/plperl/GNUmakefile patch | blob | blame | history

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile

index 66a2c3d4c9c69965892625aca1bdbb877db1b3fa..91d1296b21902bf1bac9e4341c98e4963bae2ca8 100644 (file)

--- a/src/pl/plperl/GNUmakefile

+++ b/src/pl/plperl/GNUmakefile

@@ -83,7 +83,12 @@ all: all-lib

%.c: %.xs

@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi

+# xsubpp -output option is required for coverage+vpath, but requires Perl 5.9.3

+ifeq ($(enable_coverage)$(vpath_build),yesyes)

$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap -output $@ $<

+else

+ $(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@

+endif

install: all install-lib install-data

This is the main PostgreSQL git repository.

RSS Atom