diff mbox

[2/2] build: more libcacard cleanups

Message ID 536B867C.8040303@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini May 8, 2014, 1:28 p.m. UTC 
Il 08/05/2014 15:16, Michael Tokarev ha scritto:
> However, I still (in combined result of the 2 patches) miss one little detail
> about libcacard and this stuff, which this patch also does a bit wrong.
> 
> $(NSS_LIBS) is not a dependency of hw/usb/ccid-card-emulated.o, it is a
> dependency of libcacard/vcard_emul_nss.o - the only single file in whole
> qemu tree which actually uses nss stuff.  Hopefully, it works after the
> per-object -libs fixup patch.. ;)

You're obviously right and yes, it works giving this overall patch:

Since this is getting tricky, I'll post the whole series today and send
a pull request tomorrow or Monday.

Paolo

Comments

Michael Tokarev May 8, 2014, 1:33 p.m. UTC | #1 
08.05.2014 17:28, Paolo Bonzini wrote:
> Il 08/05/2014 15:16, Michael Tokarev ha scritto:
>> However, I still (in combined result of the 2 patches) miss one little detail
>> about libcacard and this stuff, which this patch also does a bit wrong.
>>
>> $(NSS_LIBS) is not a dependency of hw/usb/ccid-card-emulated.o, it is a
>> dependency of libcacard/vcard_emul_nss.o - the only single file in whole
>> qemu tree which actually uses nss stuff.  Hopefully, it works after the
>> per-object -libs fixup patch.. ;)
> 
> You're obviously right and yes, it works giving this overall patch:

The same as I commited a few mins ago.  But with a fixme for now
in vcard_emul_nss.o-libs place (as I need to keep it working in
my tree too).

http://git.corpit.ru/?p=qemu.git;a=shortlog;h=refs/heads/mjt-buildsys-libs

Thanks,

/mjt
diff mbox

Patch

diff --git a/Makefile.objs b/Makefile.objs
index f0069ba..b897e1d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -31,6 +31,8 @@  libcacard-y += libcacard/vcard_emul_nss.o
 libcacard-y += libcacard/vcard_emul_type.o
 libcacard-y += libcacard/card_7816.o
 libcacard-y += libcacard/vcardt.o
+libcacard/vcard_emul_nss.o-cflags := $(NSS_CFLAGS)
+libcacard/vcard_emul_nss.o-libs := $(NSS_LIBS)
 
 ######################################################################
 # Target independent part of system emulation. The long term path is to
diff --git a/configure b/configure
index ac2fa15..25d59f9 100755
--- a/configure
+++ b/configure
@@ -3470,10 +3470,10 @@  if test "$smartcard_nss" != "no"; then
 #include <pk11pub.h>
 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"
-    test_cflags="$libcacard_cflags"
+    # FIXME: do not include $glib_* in here
+    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"
     # 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
     # test that the headers don't have this bug. Otherwise we would pass
@@ -3483,11 +3483,8 @@  EOF
     fi
     if test -n "$libtool" &&
        $pkg_config --atleast-version=3.12.8 nss && \
-      compile_prog "$test_cflags" "$libcacard_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"
     else
         if test "$smartcard_nss" = "yes"; then
             feature_not_found "nss"
@@ -4499,8 +4496,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
 fi
 
 if test "$libusb" = "yes" ; then
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 17d460c..3fe4dff 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -24,6 +24,7 @@  ifeq ($(CONFIG_USB_SMARTCARD),y)
 common-obj-y                          += dev-smartcard-reader.o
 common-obj-y                          += ccid-card-passthru.o
 common-obj-$(CONFIG_SMARTCARD_NSS)    += ccid-card-emulated.o
+ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard
 endif
 
 ifeq ($(CONFIG_POSIX),y)
diff --git a/libcacard/Makefile b/libcacard/Makefile
index 6b06448..4a76d03 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -25,7 +25,6 @@  vscclient$(EXESUF): libcacard/vscclient.o libcacard.la
 
 libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
 	-export-syms $(SRC_PATH)/libcacard/libcacard.syms
-libcacard.la: LIBS = $(libcacard_libs)
 libcacard.la: $(libcacard-lobj-y)
 	$(call LINK,$^)