---- qemu-1.7.0/configure.orig 2013-12-15 08:38:07.584329114 +0100
-+++ qemu-1.7.0/configure 2013-12-15 08:54:19.730954984 +0100
-@@ -3123,9 +3123,10 @@
- #include <pk11pub.h>
+diff -urNp qemu-2.4.0.orig/configure qemu-2.4.0/configure
+--- qemu-2.4.0.orig/configure 2015-08-25 06:46:52.000000000 +0000
++++ qemu-2.4.0/configure 2015-08-25 06:52:47.586593251 +0000
+@@ -3765,9 +3765,11 @@ if test "$smartcard_nss" != "no"; then
int main(void) { PK11_FreeSlot(0); return 0; }
EOF
-- smartcard_includes="-I\$(SRC_PATH)/libcacard"
-- libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-- libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+ # FIXME: do not include $glib_* in here
+ libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
+ libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
-+ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-+ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
- test_cflags="$libcacard_cflags"
+ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
+ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+- test_cflags="$nss_cflags"
++ test_cflags="$libcacard_cflags"
# The header files in nss < 3.13.3 have a bug which causes them to
# emit a warning. If we're going to compile QEMU with -Werror, then
-@@ -3136,11 +3137,10 @@
- fi
- if test -n "$libtool" &&
+ # test that the headers don't have this bug. Otherwise we would pass
+@@ -3779,6 +3781,8 @@ EOF
$pkg_config --atleast-version=3.12.8 nss && \
-- compile_prog "$test_cflags" "$libcacard_libs"; then
-+ compile_prog "$test_cflags" "$nss_libs"; then
+ compile_prog "$test_cflags" "$nss_libs"; then
smartcard_nss="yes"
-- QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
-- QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
-- libs_softmmu="$libcacard_libs $libs_softmmu"
+ QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
+ libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
else
if test "$smartcard_nss" = "yes"; then
- feature_not_found "nss"
-@@ -4082,6 +4082,8 @@
+ feature_not_found "nss" "Install nss devel >= 3.12.8"
+@@ -4933,6 +4937,8 @@ fi
+
+ if test "$smartcard_nss" = "yes" ; then
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
- echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
- echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
-+ echo "nss_libs=$nss_libs" >> $config_host_mak
-+ echo "nss_cflags=$nss_cflags" >> $config_host_mak
++ echo "LIBCACARD_LIBS=$libcacard_libs" >> $config_host_mak
++ echo "LIBCACARD_CFLAGS=$libcacard_cflags" >> $config_host_mak
+ echo "NSS_LIBS=$nss_libs" >> $config_host_mak
+ echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak
fi
+diff -urNp qemu-2.4.0.orig/hw/usb/ccid-card-passthru.c qemu-2.4.0/hw/usb/ccid-card-passthru.c
+--- qemu-2.4.0.orig/hw/usb/ccid-card-passthru.c 2015-08-11 19:11:07.000000000 +0000
++++ qemu-2.4.0/hw/usb/ccid-card-passthru.c 2015-08-25 06:52:53.709593251 +0000
+@@ -12,7 +12,7 @@
+ #include "qemu/error-report.h"
+ #include "qemu/sockets.h"
+ #include "ccid.h"
+-#include "libcacard/vscard_common.h"
++#include <cacard/vscard_common.h>
- if test "$libusb" = "yes" ; then
---- qemu-1.3.0/Makefile.orig 2012-12-03 20:37:05.000000000 +0100
-+++ qemu-1.3.0/Makefile 2012-12-16 11:08:58.001201236 +0100
-@@ -111,9 +111,6 @@
- include $(SRC_PATH)/Makefile.objs
+ #define DPRINTF(card, lvl, fmt, ...) \
+ do { \
+diff -urNp qemu-2.4.0.orig/Makefile qemu-2.4.0/Makefile
+--- qemu-2.4.0.orig/Makefile 2015-08-11 19:11:05.000000000 +0000
++++ qemu-2.4.0/Makefile 2015-08-25 06:52:47.588593251 +0000
+@@ -157,9 +157,6 @@ dummy := $(call unnest-vars,, \
+ ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/tests/Makefile
endif
-ifeq ($(CONFIG_SMARTCARD_NSS),y)
-include $(SRC_PATH)/libcacard/Makefile
-endif
- all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
+ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
---- qemu-1.5.0/Makefile.objs.orig 2013-05-20 17:34:39.000000000 +0200
-+++ qemu-1.5.0/Makefile.objs 2013-05-26 17:46:51.190865264 +0200
-@@ -74,8 +74,6 @@
+diff -urNp qemu-2.4.0.orig/Makefile.objs qemu-2.4.0/Makefile.objs
+--- qemu-2.4.0.orig/Makefile.objs 2015-08-11 19:11:05.000000000 +0000
++++ qemu-2.4.0/Makefile.objs 2015-08-25 06:54:03.092593251 +0000
+@@ -75,8 +75,6 @@ common-obj-y += backends/
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
-common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
-
- ######################################################################
- # qapi
+ common-obj-$(CONFIG_FDT) += device_tree.o
---- qemu-1.5.0/hw/usb/ccid-card-passthru.c.orig 2013-05-20 17:34:39.000000000 +0200
-+++ qemu-1.5.0/hw/usb/ccid-card-passthru.c 2013-05-26 17:58:20.660836330 +0200
-@@ -12,7 +12,7 @@
- #include "qemu/sockets.h"
- #include "monitor/monitor.h"
- #include "ccid.h"
--#include "libcacard/vscard_common.h"
-+#include <cacard/vscard_common.h>
-
- #define DPRINTF(card, lvl, fmt, ...) \
- do { \
+ ######################################################################
TLD / packages / qemu.git / blobdiff