[Qemu-devel] [PULL urgent 0/4] build system fixes for 1.3

[Qemu-devel] [PULL urgent 0/4] build system fixes for 1.3

[Paolo Bonzini]

Anyone,

the following changes since commit e24dc9feb0d68142d54dc3c097f57588836d1338:

  tci: Support deposit operations (2012-11-18 20:40:08 +0000)

are available in the git repository at:

  git://github.com/bonzini/qemu.git build-urgent

for you to fetch changes up to 16529cedcef18bf116f10279e9c9abb6645467d6:

  Makefile: Add missing dependency (fix parallel builds) (2012-11-19 10:48:32 +0100)

Thanks,

Paolo
----------------------------------------------------------------
Paolo Bonzini (3):
      libcacard: make unnesting rules available to Makefile.objs
      libcacard: link in stubs
      tests: link in stubs

Stefan Weil (1):
      Makefile: Add missing dependency (fix parallel builds)

 Makefile           | 2 ++
 libcacard/Makefile | 4 ++--
 tests/Makefile     | 4 ++--
 3 file modificati, 6 inserzioni(+), 4 rimozioni(-)
-- 
1.7.12.1

[Qemu-devel] [PATCH 1/4] libcacard: make unnesting rules available to Makefile.objs

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 libcacard/Makefile | 2 +-
 1 file modificato, 1 inserzione(+). 1 rimozione(-)

diff --git a/libcacard/Makefile b/libcacard/Makefile
index 487f434..f501cec 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -1,6 +1,6 @@
 -include ../config-host.mak
--include $(SRC_PATH)/Makefile.objs
 -include $(SRC_PATH)/rules.mak
+-include $(SRC_PATH)/Makefile.objs
 
 libcacard_includedir=$(includedir)/cacard
 
-- 
1.7.12.1

[Qemu-devel] [PATCH 2/4] libcacard: link in stubs

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 libcacard/Makefile | 2 +-
 1 file modificato, 1 inserzione(+). 1 rimozione(-)

diff --git a/libcacard/Makefile b/libcacard/Makefile
index f501cec..c26aac6 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -7,7 +7,7 @@ libcacard_includedir=$(includedir)/cacard
 $(call set-vpath, $(SRC_PATH))
 
 # objects linked into a shared library, built with libtool with -fPIC if required
-QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
+QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) $(stub-obj-y)
 QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS))
 
 QEMU_CFLAGS+=-I../
-- 
1.7.12.1

[Qemu-devel] [PATCH 3/4] tests: link in stubs

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/Makefile | 4 ++--
 1 file modificato, 2 inserzioni(+), 2 rimozioni(-)

diff --git a/tests/Makefile b/tests/Makefile
index 9bf0765..ca680e5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -48,7 +48,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.
 tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
 tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
 tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) qemu-tool.o
-tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o
+tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o libqemustub.a
 tests/test-iov$(EXESUF): tests/test-iov.o iov.o
 
 tests/test-qapi-types.c tests/test-qapi-types.h :\
@@ -81,7 +81,7 @@ TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
 QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),))
 check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
 
-qtest-obj-y = tests/libqtest.o $(oslib-obj-y)
+qtest-obj-y = tests/libqtest.o $(oslib-obj-y) libqemustub.a
 $(check-qtest-y): $(qtest-obj-y)
 
 .PHONY: check-help
-- 
1.7.12.1

[Qemu-devel] [PATCH 4/4] Makefile: Add missing dependency (fix parallel builds)

[Paolo Bonzini]

From: Stefan Weil <sw@weilnetz.de>

The executables in i386-softmmu, i386-linux-user, ...
depend on the recently added libqemustub.a.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile | 2 ++
 1 file modificato, 2 inserzioni(+)

diff --git a/Makefile b/Makefile
index b8301a2..3e8d441 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,8 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure
 $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
 
+$(SUBDIR_RULES): libqemustub.a
+
 $(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis
 
 $(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
-- 
1.7.12.1