* [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction
@ 2014-03-14 2:21 Fam Zheng
2014-03-14 12:31 ` Paolo Bonzini
2014-03-17 10:04 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Fam Zheng @ 2014-03-14 2:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Christian Mahnke, Peter Maydell
Don't sort the extracted options, sort the objects.
Reported-by: Christian Mahnke <cmahnke@googlemail.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules.mak b/rules.mak
index 9dda9f7..5c454d8 100644
--- a/rules.mak
+++ b/rules.mak
@@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
QEMU_INCLUDES += -I$(<D) -I$(@D)
maybe-add = $(filter-out $1, $2) $1
-extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \
- $(foreach o,$(call expand-objs,$1),$($o-libs))))
+extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
+ $(foreach o,$(call expand-objs,$1),$($o-libs)))
expand-objs = $(strip $(sort $(filter %.o,$1)) \
$(foreach o,$(filter %.mo,$1),$($o-objs)) \
$(filter-out %.o %.mo,$1))
--
1.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction
2014-03-14 2:21 [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction Fam Zheng
@ 2014-03-14 12:31 ` Paolo Bonzini
2014-03-17 10:04 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-03-14 12:31 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, Christian Mahnke
Il 14/03/2014 03:21, Fam Zheng ha scritto:
> Don't sort the extracted options, sort the objects.
>
> Reported-by: Christian Mahnke <cmahnke@googlemail.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> rules.mak | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules.mak b/rules.mak
> index 9dda9f7..5c454d8 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
> QEMU_INCLUDES += -I$(<D) -I$(@D)
>
> maybe-add = $(filter-out $1, $2) $1
> -extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \
> - $(foreach o,$(call expand-objs,$1),$($o-libs))))
> +extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
> + $(foreach o,$(call expand-objs,$1),$($o-libs)))
> expand-objs = $(strip $(sort $(filter %.o,$1)) \
> $(foreach o,$(filter %.mo,$1),$($o-objs)) \
> $(filter-out %.o %.mo,$1))
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction
2014-03-14 2:21 [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction Fam Zheng
2014-03-14 12:31 ` Paolo Bonzini
@ 2014-03-17 10:04 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-03-17 10:04 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, Christian Mahnke
Il 14/03/2014 03:21, Fam Zheng ha scritto:
> Don't sort the extracted options, sort the objects.
>
> Reported-by: Christian Mahnke <cmahnke@googlemail.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> rules.mak | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules.mak b/rules.mak
> index 9dda9f7..5c454d8 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
> QEMU_INCLUDES += -I$(<D) -I$(@D)
>
> maybe-add = $(filter-out $1, $2) $1
> -extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \
> - $(foreach o,$(call expand-objs,$1),$($o-libs))))
> +extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
> + $(foreach o,$(call expand-objs,$1),$($o-libs)))
> expand-objs = $(strip $(sort $(filter %.o,$1)) \
> $(foreach o,$(filter %.mo,$1),$($o-objs)) \
> $(filter-out %.o %.mo,$1))
>
Thanks, I'll send a pull request with this and the other patch.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-17 10:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-14 2:21 [Qemu-devel] [PATCH for-2.0] rules.mak: Fix per object libs extraction Fam Zheng
2014-03-14 12:31 ` Paolo Bonzini
2014-03-17 10:04 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).