All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sean Bruno <sbruno@freebsd.org>
To: qemu-devel@nongnu.org
Cc: Sean Bruno <sbruno@freebsd.org>
Subject: [Qemu-devel] [PATCH 1/3 v2] bsd-user: Revert part of update to rules.mk
Date: Sun, 15 Jun 2014 13:47:30 -0700	[thread overview]
Message-ID: <1402865252-25671-2-git-send-email-sbruno@freebsd.org> (raw)
In-Reply-To: <1402865252-25671-1-git-send-email-sbruno@freebsd.org>

In c5cb1afc4675bf5ff66e7a149d2a8cffba2eaa9e rules.mk change was causing
complete failure on bsd-user when not using --disable-curl

Signed-off-by: Sean Bruno <sbruno@freebsd.org>
---
 rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules.mak b/rules.mak
index dde8e00..4a33c27 100644
--- a/rules.mak
+++ b/rules.mak
@@ -22,7 +22,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
 # Same as -I$(SRC_PATH) -I., but for the nested source/object directories
 QEMU_INCLUDES += -I$(<D) -I$(@D)
 
-extract-libs = $(strip $(sort $(foreach o,$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.3

  reply	other threads:[~2014-06-15 20:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-15 20:47 [Qemu-devel] [PATCH 0/3 v2] bsd-user: Fix linking/dependency issues Sean Bruno
2014-06-15 20:47 ` Sean Bruno [this message]
2014-06-16  7:36   ` [Qemu-devel] [PATCH 1/3 v2] bsd-user: Revert part of update to rules.mk Peter Maydell
2014-06-16  9:12     ` Fam Zheng
2014-06-16 10:08       ` Paolo Bonzini
2014-06-16 13:55         ` Sean Bruno
2014-06-16 13:58           ` Sean Bruno
2014-06-16 14:15             ` Paolo Bonzini
2014-06-16 14:20               ` Sean Bruno
2014-06-16 14:57               ` Peter Maydell
2014-06-15 20:47 ` [Qemu-devel] [PATCH 2/3 v2] bsd-user: Add patches to fix AES_* link errors Sean Bruno
2014-06-15 20:47 ` [Qemu-devel] [PATCH 3/3 v2] bsd-user: Implement strace support for getcwd syscall Sean Bruno

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402865252-25671-2-git-send-email-sbruno@freebsd.org \
    --to=sbruno@freebsd.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.