mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Guard against using plperl's Makefile without specifying --with-perl.
The $(PERL) macro will be set by configure if it finds perl at all, but $(perl_privlibexp) isn't configured unless you said --with-perl. This results in confusing error messages if someone cd's into src/pl/plperl and tries to build there despite the configure omission, as reported by Tomas Vondra in bug #6198. Add simple checks to provide a more useful report, while not disabling other use of the makefile such as "make clean". Back-patch to 9.0, which is as far as the patch applies easily.
This commit is contained in:
		@@ -60,17 +60,21 @@ include $(top_srcdir)/src/Makefile.shlib
 | 
			
		||||
plperl.o: perlchunks.h plperl_opmask.h
 | 
			
		||||
 | 
			
		||||
plperl_opmask.h: plperl_opmask.pl
 | 
			
		||||
	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 | 
			
		||||
	$(PERL) $< $@
 | 
			
		||||
 | 
			
		||||
perlchunks.h: $(PERLCHUNKS)
 | 
			
		||||
	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 | 
			
		||||
	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > $@
 | 
			
		||||
 | 
			
		||||
all: all-lib
 | 
			
		||||
 | 
			
		||||
SPI.c: SPI.xs
 | 
			
		||||
	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 | 
			
		||||
	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 | 
			
		||||
 | 
			
		||||
Util.c: Util.xs
 | 
			
		||||
	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 | 
			
		||||
	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user