From: Anthony Liguori <aliguori@us.ibm.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: blauwirbel@gmail.com, peter.maydell@linaro.org
Subject: Re: [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT
Date: Mon, 11 Mar 2013 08:04:59 -0500 [thread overview]
Message-ID: <87y5dum6is.fsf@codemonkey.ws> (raw)
In-Reply-To: <1362997886-9470-1-git-send-email-pbonzini@redhat.com>
Paolo Bonzini <pbonzini@redhat.com> writes:
> A conflict was resolved the wrong way when merging commit 320ba5f (build:
> always link device_tree.o into emulators if libfdt available, 2013-02-05).
> This causes a build failure for the arm-softmmu target due to multiply
> defined symbol.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Applied, thanks. I've added libfdt to my build server to prevent this
in the future.
Regards,
Anthony Liguori
> ---
> hw/arm/Makefile.objs | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 2d9c69d..f5f7d0e 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -23,7 +23,6 @@ obj-y += bitbang_i2c.o marvell_88w8618_audio.o
> obj-y += framebuffer.o
> obj-y += strongarm.o
> obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
> -obj-$(CONFIG_FDT) += ../device_tree.o
> obj-$(CONFIG_KVM) += kvm/arm_gic.o
>
> obj-y := $(addprefix ../,$(obj-y))
> --
> 1.8.1.4
next prev parent reply other threads:[~2013-03-11 13:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 10:31 [Qemu-devel] [PATCH build-breaker] arm: fix compilation with CONFIG_FDT Paolo Bonzini
2013-03-11 10:38 ` Peter Maydell
2013-03-11 13:04 ` Anthony Liguori [this message]
2013-03-12 2:01 ` Anthony Liguori
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=87y5dum6is.fsf@codemonkey.ws \
--to=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.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.