[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 3/1] build: use same perl binary throughout build



On 05/30/2012 12:03 AM, Eric Blake wrote:
> Some of our rules used $(PERL), while others used 'perl'.  Always
> using the variable allows a developer to point to a different (often
> better) perl than the default one found on $PATH.
> 
> * daemon/Makefile.am ($(srcdir)/remote_dispatch.h): s/perl/$(PERL).
> * src/Makefile.am ($(srcdir)/remote/remote_client_bodies.h)
> (PDWTAGS, %protocol.c, %_probes.stp): Likewise.
> ---
> 
> Noticed this while working on the previous patch.
> 
>  daemon/Makefile.am |    4 ++--
>  src/Makefile.am    |   14 +++++++-------
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index 08e37a9..b1518c5 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -58,12 +58,12 @@ QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
> 
>  $(srcdir)/remote_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
>  		$(REMOTE_PROTOCOL)
> -	$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -b remote \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl -b remote \
>  	  $(REMOTE_PROTOCOL) > $@
> 
>  $(srcdir)/qemu_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
>  		$(QEMU_PROTOCOL)
> -	$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -b qemu \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl -b qemu \
>  	  $(QEMU_PROTOCOL) > $@
> 
>  if WITH_LIBVIRTD
> diff --git a/src/Makefile.am b/src/Makefile.am
> index b0f54b2..ee4770b 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -220,12 +220,12 @@ REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL)
> 
>  $(srcdir)/remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
>  		$(REMOTE_PROTOCOL)
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
>  	  -k remote $(REMOTE_PROTOCOL) > $@
> 
>  $(srcdir)/remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
>  		$(QEMU_PROTOCOL)
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
>  	  -k qemu $(QEMU_PROTOCOL) > $@
> 
>  REMOTE_DRIVER_SOURCES =						\
> @@ -265,7 +265,7 @@ PDWTAGS = \
>  	    rm -rf $(@F)-t?;						\
>  	    echo 'WARNING: pdwtags appears broken; skipping the $@ test' >&2;\
>  	  else								\
> -	    perl -0777 -n						\
> +	    $(PERL) -0777 -n						\
>  		-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {'	\
>  		-e '  if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||'	\
>  		-e '      $$p =~ /^enum {/) {'				\
> @@ -654,11 +654,11 @@ $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED)
>  endif WITH_REMOTE
> 
>  %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
>  	       $< $@
> 
>  %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
>  	       $< $@
> 
>  if WITH_XEN
> @@ -1321,10 +1321,10 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \
>  		  $(srcdir)/remote/qemu_protocol.x
> 
>  libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl
> -	$(AM_V_GEN)perl -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@
> 
>  %_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl
> -	$(AM_V_GEN)perl -w $(srcdir)/dtrace2systemtap.pl \
> +	$(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \
>  	  $(bindir) $(sbindir) $(libdir) $< > $@
> 
>  CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \

Nice cleanup, ACK,

Martin


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]