Patchwork [2/2] build: fix race with creating qapi-generated

login
register
mail settings
Submitter Michael Roth
Date Sept. 7, 2011, 11:40 p.m.
Message ID <1315438852-18029-2-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/113848/
State New
Headers show

Comments

Michael Roth - Sept. 7, 2011, 11:40 p.m.
Since qapi-generated/ is a global QEMU include path, we need to make
sure it is created before anything is compiled, so do this in the
configure phase rather than via the Makefile.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Anthony Liguori - Sept. 9, 2011, 6:35 p.m.
On 09/07/2011 06:40 PM, Michael Roth wrote:
> Since qapi-generated/ is a global QEMU include path, we need to make
> sure it is created before anything is compiled, so do this in the
> configure phase rather than via the Makefile.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index c3044c7..0794f31 100755
> --- a/configure
> +++ b/configure
> @@ -3612,7 +3612,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
>   DIRS="$DIRS pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS fsdev ui"
> -DIRS="$DIRS qapi"
> +DIRS="$DIRS qapi qapi-generated"
>   DIRS="$DIRS qga trace"
>   FILES="Makefile tests/Makefile"
>   FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
Anthony Liguori - Sept. 23, 2011, 3:52 p.m.
On 09/07/2011 06:40 PM, Michael Roth wrote:
> Since qapi-generated/ is a global QEMU include path, we need to make
> sure it is created before anything is compiled, so do this in the
> configure phase rather than via the Makefile.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>

Applied for real this time :-)  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index c3044c7..0794f31 100755
> --- a/configure
> +++ b/configure
> @@ -3612,7 +3612,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
>   DIRS="$DIRS pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS fsdev ui"
> -DIRS="$DIRS qapi"
> +DIRS="$DIRS qapi qapi-generated"
>   DIRS="$DIRS qga trace"
>   FILES="Makefile tests/Makefile"
>   FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"

Patch

diff --git a/configure b/configure
index c3044c7..0794f31 100755
--- a/configure
+++ b/configure
@@ -3612,7 +3612,7 @@  DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
 DIRS="$DIRS pc-bios/spapr-rtas"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"
-DIRS="$DIRS qapi"
+DIRS="$DIRS qapi qapi-generated"
 DIRS="$DIRS qga trace"
 FILES="Makefile tests/Makefile"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"