|
 |
958e1b |
From 4117c536c678c75683236e48246d78aa87a6212d Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
958e1b |
Date: Thu, 23 Oct 2014 10:10:04 +0200
|
|
|
958e1b |
Subject: [PATCH 01/19] libcacard: link against qemu-error.o for error_report()
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1414059011-15516-2-git-send-email-kwolf@redhat.com>
|
|
|
958e1b |
Patchwork-id: 61835
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH v2 1/8] libcacard: link against qemu-error.o for error_report()
|
|
|
958e1b |
Bugzilla: 1088176
|
|
|
958e1b |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
958e1b |
(cherry picked from commit 975a0015ee380f49a3be744279a6a06ab97e960a)
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Conflicts:
|
|
|
958e1b |
libcacard/Makefile
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
libcacard/Makefile | 3 ++-
|
|
|
958e1b |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/libcacard/Makefile b/libcacard/Makefile
|
|
|
958e1b |
index 6bdf0c4..c93cc6a 100644
|
|
|
958e1b |
--- a/libcacard/Makefile
|
|
|
958e1b |
+++ b/libcacard/Makefile
|
|
|
958e1b |
@@ -4,7 +4,8 @@ TOOLS += vscclient$(EXESUF)
|
|
|
958e1b |
|
|
|
958e1b |
# objects linked into a shared library, built with libtool with -fPIC if required
|
|
|
958e1b |
libcacard-obj-y = $(stub-obj-y) $(libcacard-y)
|
|
|
958e1b |
-libcacard-obj-y += util/osdep.o util/iov.o util/cutils.o util/qemu-timer-common.o util/error.o util/hexdump.o
|
|
|
958e1b |
+libcacard-obj-y += util/osdep.o util/iov.o util/cutils.o util/qemu-timer-common.o util/hexdump.o
|
|
|
958e1b |
+libcacard-obj-y += util/error.o util/qemu-error.o
|
|
|
958e1b |
libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
|
|
|
958e1b |
libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
|
|
|
958e1b |
libcacard-obj-y += $(filter trace/%, $(util-obj-y))
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|