Magellan Linux

Contents of /trunk/qemu-kvm/patches/qemu-1.2.0-ftbfs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2549 - (show annotations) (download)
Tue Mar 17 10:11:47 2015 UTC (9 years, 2 months ago) by niro
File size: 1219 byte(s)
-fix missing -lrt -lm
1 Signed-off-by: Roger Pau Monne <address@hidden>
2 ---
3 Makefile | 4 ++--
4 Makefile.target | 2 ++
5 2 files changed, 4 insertions(+), 2 deletions(-)
6
7 diff --git a/Makefile b/Makefile
8 index 301c75e..e2c3cd4 100644
9 --- a/Makefile
10 +++ b/Makefile
11 @@ -34,7 +34,7 @@ configure: ;
12
13 $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
14
15 -LIBS+=-lz $(LIBS_TOOLS)
16 +LIBS+=-lz -lm -lrt $(LIBS_TOOLS)
17
18 ifdef BUILD_DOCS
19 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
20 QMP/qmp-commands.txt
21 @@ -170,7 +170,7 @@ test-coroutine: test-coroutine.o qemu-timer-common.o
22 async.o $(coroutine-obj-y)
23 $(qapi-obj-y): $(GENERATED_HEADERS)
24 qapi-dir := $(BUILD_DIR)/qapi-generated
25 test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I
26 $(qapi-dir)
27 -qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
28 +qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lm
29
30 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
31 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
32 diff --git a/Makefile.target b/Makefile.target
33 index a111521..95d6bc0 100644
34 --- a/Makefile.target
35 +++ b/Makefile.target
36 @@ -33,6 +33,8 @@ endif
37 PROGS=$(QEMU_PROG)
38 STPFILES=
39
40 +LIBS+=-lrt
41 +
42 ifndef CONFIG_HAIKU
43 LIBS+=-lm
44 endif
45 --
46 1.7.9