* [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects
@ 2010-09-12 15:21 Andreas Färber
2010-09-13 10:40 ` [Qemu-devel] " Stefan Hajnoczi
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andreas Färber @ 2010-09-12 15:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Anthony Liguori, Stefan Hajnoczi, Prerna Saxena
On a clean build, after generating trace.h, make would recurse into *-*-user
without a clue how to build ../trace.o (added to $(obj-y) in Makefile.target)
since its generation rule is in the main Makefile.
The softmmus are seemingly unaffected because the $(TOOLS), which each have
a dependency on $(trace-obj-y), are built first for the build-all target.
Add a dependency on $(trace-obj-y) for %-user, as done for the qemu-* tools.
Let's be paranoid and do the same for %-softmmu while at it, just in case
someone messes with $(TOOLS) or calls the Makefile target directly.
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Prerna Saxena <prerna@linux.vnet.ibm.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index ab91d42..090d632 100644
--- a/Makefile
+++ b/Makefile
@@ -80,9 +80,9 @@ include $(SRC_PATH)/Makefile.objs
endif
$(common-obj-y): $(GENERATED_HEADERS)
-$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis
+$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
-$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libdis-user subdir-libuser
+$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
romsubdir-%:
--
1.7.2.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] Re: [PATCH] trace: Fix user emulator dependency on trace objects
2010-09-12 15:21 [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects Andreas Färber
@ 2010-09-13 10:40 ` Stefan Hajnoczi
2010-09-13 18:15 ` [Qemu-devel] " Stefan Weil
2010-09-19 9:28 ` Andreas Färber
2 siblings, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2010-09-13 10:40 UTC (permalink / raw)
To: Andreas Färber
Cc: Blue Swirl, Anthony Liguori, qemu-devel, Prerna Saxena
On Sun, Sep 12, 2010 at 05:21:36PM +0200, Andreas Färber wrote:
> On a clean build, after generating trace.h, make would recurse into *-*-user
> without a clue how to build ../trace.o (added to $(obj-y) in Makefile.target)
> since its generation rule is in the main Makefile.
> The softmmus are seemingly unaffected because the $(TOOLS), which each have
> a dependency on $(trace-obj-y), are built first for the build-all target.
>
> Add a dependency on $(trace-obj-y) for %-user, as done for the qemu-* tools.
>
> Let's be paranoid and do the same for %-softmmu while at it, just in case
> someone messes with $(TOOLS) or calls the Makefile target directly.
>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> Cc: Prerna Saxena <prerna@linux.vnet.ibm.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> ---
> Makefile | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
Thanks for the patch!
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects
2010-09-12 15:21 [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects Andreas Färber
2010-09-13 10:40 ` [Qemu-devel] " Stefan Hajnoczi
@ 2010-09-13 18:15 ` Stefan Weil
2010-09-19 9:28 ` Andreas Färber
2 siblings, 0 replies; 5+ messages in thread
From: Stefan Weil @ 2010-09-13 18:15 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-devel
Am 12.09.2010 17:21, schrieb Andreas Färber:
> On a clean build, after generating trace.h, make would recurse into
> *-*-user
> without a clue how to build ../trace.o (added to $(obj-y) in
> Makefile.target)
> since its generation rule is in the main Makefile.
> The softmmus are seemingly unaffected because the $(TOOLS), which each
> have
> a dependency on $(trace-obj-y), are built first for the build-all target.
>
> Add a dependency on $(trace-obj-y) for %-user, as done for the qemu-*
> tools.
>
> Let's be paranoid and do the same for %-softmmu while at it, just in case
> someone messes with $(TOOLS) or calls the Makefile target directly.
>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> Cc: Prerna Saxena <prerna@linux.vnet.ibm.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> ---
> Makefile | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index ab91d42..090d632 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -80,9 +80,9 @@ include $(SRC_PATH)/Makefile.objs
> endif
>
> $(common-obj-y): $(GENERATED_HEADERS)
> -$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis
> +$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y)
> subdir-libdis
>
> -$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS)
> subdir-libdis-user subdir-libuser
> +$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y)
> subdir-libdis-user subdir-libuser
>
> ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
> romsubdir-%:
Acked-by: Stefan Weil <weil@mail.berlios.de>
Doing the same for %-softmmu was a good idea and helped me, thanks.
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects
2010-09-12 15:21 [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects Andreas Färber
2010-09-13 10:40 ` [Qemu-devel] " Stefan Hajnoczi
2010-09-13 18:15 ` [Qemu-devel] " Stefan Weil
@ 2010-09-19 9:28 ` Andreas Färber
2010-09-21 19:47 ` Blue Swirl
2 siblings, 1 reply; 5+ messages in thread
From: Andreas Färber @ 2010-09-19 9:28 UTC (permalink / raw)
To: qemu-devel@nongnu.org Developers
Cc: Blue Swirl, Anthony Liguori, Stefan Hajnoczi, Prerna Saxena
Am 12.09.2010 um 17:21 schrieb Andreas Färber:
> On a clean build, after generating trace.h, make would recurse into
> *-*-user
> without a clue how to build ../trace.o (added to $(obj-y) in
> Makefile.target)
> since its generation rule is in the main Makefile.
> The softmmus are seemingly unaffected because the $(TOOLS), which
> each have
> a dependency on $(trace-obj-y), are built first for the build-all
> target.
>
> Add a dependency on $(trace-obj-y) for %-user, as done for the qemu-
> * tools.
>
> Let's be paranoid and do the same for %-softmmu while at it, just in
> case
> someone messes with $(TOOLS) or calls the Makefile target directly.
>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> Cc: Prerna Saxena <prerna@linux.vnet.ibm.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
Acked-by: Stefan Weil <weil@mail.berlios.de>
Ping? 7 days, one ack, one thank-you from the original author. Could
someone please commit or comment please? This fixes a broken build
configuration on all platforms.
Thanks,
Andreas
> ---
> Makefile | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index ab91d42..090d632 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -80,9 +80,9 @@ include $(SRC_PATH)/Makefile.objs
> endif
>
> $(common-obj-y): $(GENERATED_HEADERS)
> -$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis
> +$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y)
> subdir-libdis
>
> -$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-
> libdis-user subdir-libuser
> +$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-
> y) subdir-libdis-user subdir-libuser
>
> ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
> romsubdir-%:
> --
> 1.7.2.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects
2010-09-19 9:28 ` Andreas Färber
@ 2010-09-21 19:47 ` Blue Swirl
0 siblings, 0 replies; 5+ messages in thread
From: Blue Swirl @ 2010-09-21 19:47 UTC (permalink / raw)
To: Andreas Färber
Cc: Anthony Liguori, Prerna Saxena, qemu-devel@nongnu.org Developers,
Stefan Hajnoczi
Thanks, applied.
On Sun, Sep 19, 2010 at 9:28 AM, Andreas Färber <andreas.faerber@web.de> wrote:
> Am 12.09.2010 um 17:21 schrieb Andreas Färber:
>
>> On a clean build, after generating trace.h, make would recurse into
>> *-*-user
>> without a clue how to build ../trace.o (added to $(obj-y) in
>> Makefile.target)
>> since its generation rule is in the main Makefile.
>> The softmmus are seemingly unaffected because the $(TOOLS), which each
>> have
>> a dependency on $(trace-obj-y), are built first for the build-all target.
>>
>> Add a dependency on $(trace-obj-y) for %-user, as done for the qemu-*
>> tools.
>>
>> Let's be paranoid and do the same for %-softmmu while at it, just in case
>> someone messes with $(TOOLS) or calls the Makefile target directly.
>>
>> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
>> Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
>> Cc: Prerna Saxena <prerna@linux.vnet.ibm.com>
>> Cc: Blue Swirl <blauwirbel@gmail.com>
>> Cc: Anthony Liguori <aliguori@us.ibm.com>
>
> Acked-by: Stefan Weil <weil@mail.berlios.de>
>
> Ping? 7 days, one ack, one thank-you from the original author. Could someone
> please commit or comment please? This fixes a broken build configuration on
> all platforms.
>
> Thanks,
> Andreas
>
>> ---
>> Makefile | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index ab91d42..090d632 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -80,9 +80,9 @@ include $(SRC_PATH)/Makefile.objs
>> endif
>>
>> $(common-obj-y): $(GENERATED_HEADERS)
>> -$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y) subdir-libdis
>> +$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y)
>> subdir-libdis
>>
>> -$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) subdir-libdis-user
>> subdir-libuser
>> +$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y)
>> subdir-libdis-user subdir-libuser
>>
>> ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
>> romsubdir-%:
>> --
>> 1.7.2.2
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-21 19:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-12 15:21 [Qemu-devel] [PATCH] trace: Fix user emulator dependency on trace objects Andreas Färber
2010-09-13 10:40 ` [Qemu-devel] " Stefan Hajnoczi
2010-09-13 18:15 ` [Qemu-devel] " Stefan Weil
2010-09-19 9:28 ` Andreas Färber
2010-09-21 19:47 ` Blue Swirl
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.