]>
Commit | Line | Data |
---|---|---|
46ca1df6 JB |
1 | --- qemu-1.3.0/configure.orig 2012-12-16 11:06:51.151203881 +0100 |
2 | +++ qemu-1.3.0/configure 2012-12-16 11:07:56.571202516 +0100 | |
3 | @@ -2767,9 +2767,10 @@ | |
c18e9cf6 JB |
4 | #include <pk11pub.h> |
5 | int main(void) { PK11_FreeSlot(0); return 0; } | |
6 | EOF | |
7 | - smartcard_includes="-I\$(SRC_PATH)/libcacard" | |
8 | - libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" | |
9 | - libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" | |
10 | + libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)" | |
11 | + libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)" | |
12 | + nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" | |
13 | + nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" | |
14 | test_cflags="$libcacard_cflags" | |
15 | # The header files in nss < 3.13.3 have a bug which causes them to | |
16 | # emit a warning. If we're going to compile QEMU with -Werror, then | |
46ca1df6 | 17 | @@ -2779,11 +2780,10 @@ |
c18e9cf6 JB |
18 | test_cflags="-Werror $test_cflags" |
19 | fi | |
20 | if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ | |
21 | - compile_prog "$test_cflags" "$libcacard_libs"; then | |
22 | + compile_prog "$test_cflags" "$nss_libs"; then | |
23 | smartcard_nss="yes" | |
24 | - QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags" | |
25 | - QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes" | |
26 | - libs_softmmu="$libcacard_libs $libs_softmmu" | |
27 | + QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags" | |
28 | + libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu" | |
29 | else | |
30 | if test "$smartcard_nss" = "yes"; then | |
31 | feature_not_found "nss" | |
46ca1df6 | 32 | @@ -3133,9 +3133,6 @@ |
31a48499 | 33 | tools="qemu-ga\$(EXESUF) $tools" |
c18e9cf6 JB |
34 | fi |
35 | fi | |
31a48499 JB |
36 | - if test "$smartcard_nss" = "yes" ; then |
37 | - tools="vscclient\$(EXESUF) $tools" | |
38 | - fi | |
c18e9cf6 | 39 | fi |
c18e9cf6 JB |
40 | |
41 | # Mac OS X ships with a broken assembler | |
46ca1df6 | 42 | @@ -3532,6 +3529,8 @@ |
c18e9cf6 JB |
43 | echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak |
44 | echo "libcacard_libs=$libcacard_libs" >> $config_host_mak | |
45 | echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak | |
46 | + echo "nss_libs=$nss_libs" >> $config_host_mak | |
47 | + echo "nss_cflags=$nss_cflags" >> $config_host_mak | |
48 | fi | |
49 | ||
50 | if test "$usb_redir" = "yes" ; then | |
46ca1df6 JB |
51 | @@ -3970,9 +3969,6 @@ |
52 | if test "$target_softmmu" = "yes" ; then | |
53 | echo "CONFIG_SOFTMMU=y" >> $config_target_mak | |
c18e9cf6 | 54 | echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak |
c18e9cf6 JB |
55 | - if test "$smartcard_nss" = "yes" ; then |
56 | - echo "subdir-$target: subdir-libcacard" >> $config_host_mak | |
57 | - fi | |
58 | case "$target_arch2" in | |
59 | i386|x86_64) | |
60 | echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak | |
46ca1df6 | 61 | @@ -4179,10 +4175,9 @@ |
c18e9cf6 JB |
62 | DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" |
63 | DIRS="$DIRS roms/seabios roms/vgabios" | |
64 | DIRS="$DIRS qapi-generated" | |
65 | -DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" | |
66 | FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" | |
67 | FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" | |
68 | -FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" | |
69 | +FILES="$FILES tests/tcg/lm32/Makefile" | |
70 | FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" | |
71 | FILES="$FILES pc-bios/spapr-rtas/Makefile" | |
72 | FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" | |
73 | diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c | |
74 | --- qemu-kvm-1.2.0/hw/ccid-card-passthru.c 2012-09-06 10:31:27.000000000 +0200 | |
75 | +++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c 2012-11-09 07:44:11.286748135 +0100 | |
76 | @@ -12,7 +12,7 @@ | |
77 | #include "qemu_socket.h" | |
78 | #include "monitor.h" | |
79 | #include "hw/ccid.h" | |
80 | -#include "libcacard/vscard_common.h" | |
81 | +#include <cacard/vscard_common.h> | |
82 | ||
83 | #define DPRINTF(card, lvl, fmt, ...) \ | |
84 | do { \ | |
46ca1df6 JB |
85 | --- qemu-1.3.0/Makefile.orig 2012-12-03 20:37:05.000000000 +0100 |
86 | +++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100 | |
87 | @@ -116,8 +116,6 @@ | |
c18e9cf6 JB |
88 | include $(SRC_PATH)/Makefile.objs |
89 | endif | |
90 | ||
91 | -subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o | |
92 | - | |
46ca1df6 JB |
93 | subdir-pixman: pixman/Makefile |
94 | $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) | |
c18e9cf6 | 95 | |
46ca1df6 JB |
96 | @@ -166,24 +164,6 @@ |
97 | libqemustub.a: $(stub-obj-y) | |
c18e9cf6 | 98 | |
46ca1df6 | 99 | ###################################################################### |
c18e9cf6 JB |
100 | -# Support building shared library libcacard |
101 | - | |
102 | -.PHONY: libcacard.la install-libcacard | |
103 | -ifeq ($(LIBTOOL),) | |
104 | -libcacard.la: | |
105 | - @echo "libtool is missing, please install and rerun configure"; exit 1 | |
106 | - | |
107 | -install-libcacard: | |
108 | - @echo "libtool is missing, please install and rerun configure"; exit 1 | |
109 | -else | |
110 | -libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y))) | |
111 | - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,) | |
112 | - | |
113 | -install-libcacard: libcacard.la | |
114 | - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) | |
115 | -endif | |
116 | - | |
117 | -###################################################################### | |
118 | ||
119 | qemu-img.o: qemu-img-cmds.h | |
120 | ||
46ca1df6 | 121 | @@ -197,9 +177,6 @@ |
c18e9cf6 JB |
122 | |
123 | qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o | |
124 | ||
46ca1df6 | 125 | -vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a |
c18e9cf6 JB |
126 | - $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") |
127 | - | |
128 | fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) | |
129 | fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap | |
130 | ||
46ca1df6 | 131 | @@ -260,7 +237,7 @@ |
c18e9cf6 JB |
132 | rm -rf qapi-generated |
133 | rm -rf qga/qapi-generated | |
134 | $(MAKE) -C tests/tcg clean | |
135 | - for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ | |
136 | + for d in $(ALL_SUBDIRS) $(QEMULIBS); do \ | |
137 | if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ | |
138 | rm -f $$d/qemu-options.def; \ | |
139 | done | |
140 | diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.objs | |
141 | --- qemu-kvm-1.2.0/Makefile.objs 2012-09-06 10:31:27.000000000 +0200 | |
142 | +++ qemu-kvm-1.2.0-system-libcacard/Makefile.objs 2012-11-09 07:45:10.880079366 +0100 | |
143 | @@ -204,17 +204,6 @@ | |
144 | $(trace-obj-y): $(GENERATED_HEADERS) | |
145 | ||
146 | ###################################################################### | |
147 | -# smartcard | |
148 | - | |
149 | -libcacard-y += libcacard/cac.o libcacard/event.o | |
150 | -libcacard-y += libcacard/vcard.o libcacard/vreader.o | |
151 | -libcacard-y += libcacard/vcard_emul_nss.o | |
152 | -libcacard-y += libcacard/vcard_emul_type.o | |
153 | -libcacard-y += libcacard/card_7816.o | |
154 | - | |
155 | -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) | |
156 | - | |
157 | -###################################################################### | |
158 | # qapi | |
159 | ||
160 | qapi-obj-y = qapi/ |