]>
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 | |
f8ecc2ec AG |
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 | 18 | fi |
f8ecc2ec AG |
19 | if test -n "$libtool" && |
20 | $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 | @@ -3532,6 +3529,8 @@ |
c18e9cf6 JB |
33 | echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak |
34 | echo "libcacard_libs=$libcacard_libs" >> $config_host_mak | |
35 | echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak | |
36 | + echo "nss_libs=$nss_libs" >> $config_host_mak | |
37 | + echo "nss_cflags=$nss_cflags" >> $config_host_mak | |
38 | fi | |
39 | ||
40 | if test "$usb_redir" = "yes" ; then | |
c18e9cf6 JB |
41 | diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c |
42 | --- qemu-kvm-1.2.0/hw/ccid-card-passthru.c 2012-09-06 10:31:27.000000000 +0200 | |
43 | +++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c 2012-11-09 07:44:11.286748135 +0100 | |
44 | @@ -12,7 +12,7 @@ | |
45 | #include "qemu_socket.h" | |
46 | #include "monitor.h" | |
47 | #include "hw/ccid.h" | |
48 | -#include "libcacard/vscard_common.h" | |
49 | +#include <cacard/vscard_common.h> | |
50 | ||
51 | #define DPRINTF(card, lvl, fmt, ...) \ | |
52 | do { \ | |
46ca1df6 JB |
53 | --- qemu-1.3.0/Makefile.orig 2012-12-03 20:37:05.000000000 +0100 |
54 | +++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100 | |
f8ecc2ec | 55 | @@ -111,9 +111,6 @@ |
c18e9cf6 | 56 | include $(SRC_PATH)/Makefile.objs |
f8ecc2ec | 57 | include $(SRC_PATH)/tests/Makefile |
c18e9cf6 | 58 | endif |
f8ecc2ec AG |
59 | -ifeq ($(CONFIG_SMARTCARD_NSS),y) |
60 | -include $(SRC_PATH)/libcacard/Makefile | |
c18e9cf6 | 61 | -endif |
c18e9cf6 | 62 | |
f8ecc2ec | 63 | all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all |
c18e9cf6 | 64 | |
c18e9cf6 JB |
65 | diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.objs |
66 | --- qemu-kvm-1.2.0/Makefile.objs 2012-09-06 10:31:27.000000000 +0200 | |
67 | +++ qemu-kvm-1.2.0-system-libcacard/Makefile.objs 2012-11-09 07:45:10.880079366 +0100 | |
f8ecc2ec AG |
68 | @@ -34,15 +34,6 @@ |
69 | endif | |
c18e9cf6 JB |
70 | |
71 | ###################################################################### | |
72 | -# smartcard | |
73 | - | |
74 | -libcacard-y += libcacard/cac.o libcacard/event.o | |
75 | -libcacard-y += libcacard/vcard.o libcacard/vreader.o | |
76 | -libcacard-y += libcacard/vcard_emul_nss.o | |
77 | -libcacard-y += libcacard/vcard_emul_type.o | |
78 | -libcacard-y += libcacard/card_7816.o | |
79 | - | |
f8ecc2ec AG |
80 | -###################################################################### |
81 | # Target independent part of system emulation. The long term path is to | |
82 | # suppress *all* target specific code in case of system emulation, i.e. a | |
83 | # single QEMU executable should support all CPUs and machines. | |
84 | @@ -81,8 +72,6 @@ | |
85 | ||
86 | common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o | |
87 | ||
c18e9cf6 JB |
88 | -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) |
89 | - | |
f8ecc2ec | 90 | ###################################################################### |
c18e9cf6 JB |
91 | # qapi |
92 |