Re: [Xen-devel] [PATCH] tools/vtpm: fix tpm_version.h error during parallel build

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-08-02 at 16:53 +0100, Olaf Hering wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@xxxxxxxxx>
> # Date 1343922758 -7200
> # Node ID 756f87bda3c3172d34cab60dc7279c3292775275
> # Parent  983ea7521badb3e05d3379044fb283732ef558d6
> tools/vtpm: fix tpm_version.h error during parallel build
> 
> Generating the tpm_version.h is not make -j safe:
> 
> In file included from ../tpm/tpm_emulator.h:25:0,
>                  from ../tpm/tpm_startup.c:18:
> ../tpm/tpm_version.h:1:0: error: unterminated #ifndef
> make[5]: *** [tpm_startup.o] Error 1
> 
> This happens because make can not know that 'all-recursive' depends on
> 'version'. Fix this by calling the individual make targets. Doing it
> this way avoids adding yet another patch.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Applied.

I made the last paragraph:
        This happens because make can not know that 'all-recursive' depends on
        'version'. Fix this by calling the individual make targets.
        Doing it
        this way avoids adding yet another patch to the downloaded
        source.

(i.e. gave some hint why we want to avoid patching)

> 
> diff -r 983ea7521bad -r 756f87bda3c3 tools/vtpm/Makefile
> --- a/tools/vtpm/Makefile
> +++ b/tools/vtpm/Makefile
> @@ -23,7 +23,7 @@ build: build_sub
>  
>  .PHONY: install
>  install: build
> -     $(MAKE) -C $(VTPM_DIR) $@
> +     $(MAKE) -C $(VTPM_DIR) install-recursive
>  
>  .PHONY: clean
>  clean:
> @@ -66,7 +66,8 @@ updatepatches: clean orig
>  .PHONY: build_sub
>  build_sub: $(VTPM_DIR)/tpmd/tpmd
>       set -e; if [ -e $(GMP_HEADER) ]; then \
> -             $(MAKE) -C $(VTPM_DIR); \
> +             $(MAKE) -C $(VTPM_DIR) version; \
> +             $(MAKE) -C $(VTPM_DIR) all-recursive; \
>       else \
>               echo "=== Unable to build VTPMs. libgmp could not be found."; \
>       fi
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel