NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit6a24742

committed

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 intosrc/pl/plperl and tries to build there despite the configure omission,as reported by Tomas Vondra in bug #6198. Add simple checks toprovide a more useful report, while not disabling other use of themakefile such as "make clean".Back-patch to 9.0, which is as far as the patch applies easily.

1 parent4c2777d commit6a24742Copy full SHA for 6a24742

File tree

1 file changed

-0

lines changed

src/pl/plperl
- GNUmakefile

1 file changed

-0

lines changed

`‎src/pl/plperl/GNUmakefile`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,17 +60,21 @@ include $(top_srcdir)/src/Makefile.shlib`
`60`	`60`	`plperl.o: perlchunks.h plperl_opmask.h`
`61`	`61`
`62`	`62`	`plperl_opmask.h: plperl_opmask.pl`
	`63`	`+@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`63`	`64`	`$(PERL)$<$@`
`64`	`65`
`65`	`66`	`perlchunks.h:$(PERLCHUNKS)`
	`67`	`+@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`66`	`68`	`$(PERL)$(srcdir)/text2macro.pl --strip='^(\#.\|\s)$$'$^>$@`
`67`	`69`
`68`	`70`	`all: all-lib`
`69`	`71`
`70`	`72`	`SPI.c: SPI.xs`
	`73`	`+@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`71`	`74`	`$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`72`	`75`
`73`	`76`	`Util.c: Util.xs`
	`77`	`+@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`74`	`78`	`$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`75`	`79`
`76`	`80`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6a24742

File tree

1 file changed

1 file changed

`‎src/pl/plperl/GNUmakefile`

0 commit comments