]>
Commit | Line | Data |
---|---|---|
f39d158a AM |
1 | diff -urN qemu-2.1.2.org/configure qemu-2.1.2/configure |
2 | --- qemu-2.1.2.org/configure 2014-09-25 21:54:52.000000000 +0200 | |
3 | +++ qemu-2.1.2/configure 2014-11-08 13:52:27.205351822 +0100 | |
4 | @@ -3546,9 +3546,10 @@ | |
c18e9cf6 JB |
5 | #include <pk11pub.h> |
6 | int main(void) { PK11_FreeSlot(0); return 0; } | |
7 | EOF | |
f39d158a AM |
8 | - # FIXME: do not include $glib_* in here |
9 | - nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" | |
10 | - nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" | |
f8ecc2ec AG |
11 | + libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)" |
12 | + libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)" | |
f39d158a AM |
13 | + nss_libs="$($pkg_config --libs nss 2>/dev/null)" |
14 | + nss_cflags="$($pkg_config --cflags nss 2>/dev/null)" | |
15 | test_cflags="$nss_cflags" | |
f8ecc2ec AG |
16 | # The header files in nss < 3.13.3 have a bug which causes them to |
17 | # emit a warning. If we're going to compile QEMU with -Werror, then | |
f39d158a | 18 | @@ -4582,6 +4583,8 @@ |
c18e9cf6 | 19 | echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak |
f39d158a AM |
20 | echo "NSS_LIBS=$nss_libs" >> $config_host_mak |
21 | echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak | |
22 | + echo "LIBCACARD_LIBS=$libcacard_libs" >> $config_host_mak | |
23 | + echo "LIBCACARD_CFLAGS=$libcacard_cflags" >> $config_host_mak | |
c18e9cf6 JB |
24 | fi |
25 | ||
68eb235d | 26 | if test "$libusb" = "yes" ; then |
f39d158a AM |
27 | diff -urN qemu-2.1.2.org/hw/usb/ccid-card-passthru.c qemu-2.1.2/hw/usb/ccid-card-passthru.c |
28 | --- qemu-2.1.2.org/hw/usb/ccid-card-passthru.c 2014-09-25 21:54:52.000000000 +0200 | |
29 | +++ qemu-2.1.2/hw/usb/ccid-card-passthru.c 2014-11-08 13:52:56.156055395 +0100 | |
30 | @@ -12,7 +12,7 @@ | |
31 | #include "qemu/sockets.h" | |
32 | #include "monitor/monitor.h" | |
33 | #include "ccid.h" | |
34 | -#include "libcacard/vscard_common.h" | |
35 | +#include "cacard/vscard_common.h" | |
36 | ||
37 | #define DPRINTF(card, lvl, fmt, ...) \ | |
38 | do { \ | |
39 | diff -urN qemu-2.1.2.org/hw/usb/Makefile.objs qemu-2.1.2/hw/usb/Makefile.objs | |
40 | --- qemu-2.1.2.org/hw/usb/Makefile.objs 2014-09-25 21:54:52.000000000 +0200 | |
41 | +++ qemu-2.1.2/hw/usb/Makefile.objs 2014-11-08 13:55:50.056948226 +0100 | |
42 | @@ -24,7 +24,8 @@ | |
43 | common-obj-y += dev-smartcard-reader.o | |
44 | common-obj-y += ccid-card-passthru.o | |
45 | common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o | |
46 | -ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard | |
47 | +ccid-card-emulated.o-cflags := $(LIBCACARD_CFLAGS) | |
48 | +ccid-card-emulated.o-libs := $(LIBCACARD_LIBS) | |
49 | endif | |
50 | ||
51 | ifeq ($(CONFIG_POSIX),y) | |
52 | diff -urN qemu-2.1.2.org/Makefile qemu-2.1.2/Makefile | |
53 | --- qemu-2.1.2.org/Makefile 2014-09-25 21:54:52.000000000 +0200 | |
54 | +++ qemu-2.1.2/Makefile 2014-11-08 13:48:43.709920110 +0100 | |
55 | @@ -142,9 +142,6 @@ | |
56 | ifneq ($(wildcard config-host.mak),) | |
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 | |
f39d158a | 63 | all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules |
c18e9cf6 | 64 | |
f39d158a AM |
65 | diff -urN qemu-2.1.2.org/Makefile.objs qemu-2.1.2/Makefile.objs |
66 | --- qemu-2.1.2.org/Makefile.objs 2014-09-25 21:54:52.000000000 +0200 | |
67 | +++ qemu-2.1.2/Makefile.objs 2014-11-08 13:49:29.161024919 +0100 | |
54b666b7 | 68 | @@ -75,8 +75,6 @@ common-obj-y += backends/ |
71150f0b JB |
69 | |
70 | common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o | |
71 | ||
72 | -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) | |
73 | - | |
54b666b7 | 74 | common-obj-$(CONFIG_FDT) += device_tree.o |
71150f0b | 75 | |
54b666b7 AM |
76 | ###################################################################### |
77 |