[Qemu-devel] [PATCH] Makefile: fix build when VPATH is outside GIT tree

[Qemu-devel] [PATCH] Makefile: fix build when VPATH is outside GIT tree

[Daniel P. Berrange]

Steve Ellcey / Leon Alrae reported that QEMU fails to build when
the VPATH directory is outside of the GIT tree, and the system
emulators & tools build is disabled. eg

   cd ..
   mkdir build
   cd build
   ../qemu/configure --disable-system --disable-tools
   make
   (...)
   make[1]: *** No rule to make target `../qom/object.o', needed by `qemu-aarch64'. Stop.
   make: *** [subdir-aarch64-linux-user] Error 2

The problem is due to the fact that some sub directory deps
were listed against SOFTMMU_SUBDIR_RULES instead of SUBDIR_RULES,
so were only processed for system emulators, not user emalutors.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 291fb54..acd261d 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,6 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
 
 $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
 $(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y)
-$(SOFTMMU_SUBDIR_RULES): $(qom-obj-y)
 $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak
 
 subdir-%:
@@ -202,7 +201,7 @@ subdir-dtc:dtc/libfdt dtc/tests
 dtc/%:
 	mkdir -p $@
 
-$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y)
+$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
 
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:
-- 
2.4.3

Re: [Qemu-devel] [PATCH] Makefile: fix build when VPATH is outside GIT tree

[Paolo Bonzini]

On 18/09/2015 12:01, Daniel P. Berrange wrote:
> Steve Ellcey / Leon Alrae reported that QEMU fails to build when
> the VPATH directory is outside of the GIT tree, and the system
> emulators & tools build is disabled. eg
> 
>    cd ..
>    mkdir build
>    cd build
>    ../qemu/configure --disable-system --disable-tools
>    make
>    (...)
>    make[1]: *** No rule to make target `../qom/object.o', needed by `qemu-aarch64'. Stop.
>    make: *** [subdir-aarch64-linux-user] Error 2
> 
> The problem is due to the fact that some sub directory deps
> were listed against SOFTMMU_SUBDIR_RULES instead of SUBDIR_RULES,
> so were only processed for system emulators, not user emalutors.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Queued, thanks.

Paolo

> ---
>  Makefile | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 291fb54..acd261d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -177,7 +177,6 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
>  
>  $(SOFTMMU_SUBDIR_RULES): $(block-obj-y)
>  $(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y)
> -$(SOFTMMU_SUBDIR_RULES): $(qom-obj-y)
>  $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak
>  
>  subdir-%:
> @@ -202,7 +201,7 @@ subdir-dtc:dtc/libfdt dtc/tests
>  dtc/%:
>  	mkdir -p $@
>  
> -$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y)
> +$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
>  
>  ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
>  romsubdir-%:
> 

Re: [Qemu-devel] [PATCH] Makefile: fix build when VPATH is outside GIT tree

[Steve Ellcey]

On Fri, 2015-09-18 at 13:40 +0200, Paolo Bonzini wrote:

> > The problem is due to the fact that some sub directory deps
> > were listed against SOFTMMU_SUBDIR_RULES instead of SUBDIR_RULES,
> > so were only processed for system emulators, not user emalutors.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> 
> Queued, thanks.
> 
> Paolo

Is being queued a status for qemu patches or does that just mean it is
in your personal queue to handle when you have time?

I would like to remove my local patch for this and go back to using the
top-of-tree sources, but it doesn't look like this change has been
checked in yet.  It does fix my build problem.

Steve Ellcey
sellcey@imgtec.com

Re: [Qemu-devel] [PATCH] Makefile: fix build when VPATH is outside GIT tree

[Paolo Bonzini]

On 25/09/2015 23:24, Steve Ellcey wrote:
> On Fri, 2015-09-18 at 13:40 +0200, Paolo Bonzini wrote:
> 
> > > The problem is due to the fact that some sub directory deps
> > > were listed against SOFTMMU_SUBDIR_RULES instead of SUBDIR_RULES,
> > > so were only processed for system emulators, not user emalutors.
> > > 
> > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > 
> > Queued, thanks.
> 
> Is being queued a status for qemu patches or does that just mean it is
> in your personal queue to handle when you have time?

It's both.  I handle patches that fall through the cracks between
maintained areas (which includes the build system, as it has no formal
maintainer).  So if it's "queued" that means that the submitter need not
care about it anymore, as the patch is in my hands now.

I tend to flush the queue pretty often, around once a week.  The patch
is now in.

Paolo

> I would like to remove my local patch for this and go back to using the
> top-of-tree sources, but it doesn't look like this change has been
> checked in yet.  It does fix my build problem.