Patchwork Makefile: fix that qemu doesn't compile with qemu-ga and simpletrace configured.

login
register
mail settings
Submitter Mark Wu
Date Sept. 1, 2011, 5:56 a.m.
Message ID <1314856583-11883-1-git-send-email-wudxw@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/112812/
State New
Headers show

Comments

Mark Wu - Sept. 1, 2011, 5:56 a.m.
From: Mark Wu <wudxw@linux.vnet.ibm.com>

Without this fix, it will not compile when simpletrace is configured:
$ ./configure --enable-trace-backend=simple
$ make
  GEN   config-host.h
  GEN   trace.h
  CC    qemu-ga.o
  GEN   trace.c
  LINK  qemu-ga
simpletrace.o: In function `get_clock':
$qemu_src/qemu-timer.h:122: undefined reference to `use_rt_clock'
collect2: ld returned 1 exit status
make: *** [qemu-ga] Error 1

Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
=?utf-8?Q?Llu=C3=ADs?= - Sept. 1, 2011, 11:06 a.m.
wudxw  writes:

> From: Mark Wu <wudxw@linux.vnet.ibm.com>
> Without this fix, it will not compile when simpletrace is configured:
> $ ./configure --enable-trace-backend=simple
> $ make
>   GEN   config-host.h
>   GEN   trace.h
>   CC    qemu-ga.o
>   GEN   trace.c
>   LINK  qemu-ga
> simpletrace.o: In function `get_clock':
> $qemu_src/qemu-timer.h:122: undefined reference to `use_rt_clock'
> collect2: ld returned 1 exit status
> make: *** [qemu-ga] Error 1

> Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>

This pull request addresses the issue (first 2 patches):

http://lists.gnu.org/archive/html/qemu-devel/2011-09/msg00030.html


Lluis

Patch

diff --git a/Makefile b/Makefile
index 8606849..6dc6ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@  QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-
 $(QGALIB_GEN): $(GENERATED_HEADERS)
 $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
 
-qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o)
+qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o) qemu-timer-common.o
 
 QEMULIBS=libhw32 libhw64 libuser libdis libdis-user