postgres.git / summary / log / commit / refs

commit    65c865620237bf1964757436a36c40af591d30fb
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Wed Sep 27 19:51:04 2017 +0000

    Fix plperl build
    
    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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 66a2c3d4c9c..91d1296b219 100644
--- 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


[parent: af44cbd5ecd7]