[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLA
From: |
Michael Tokarev |
Subject: |
Re: [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars |
Date: |
Thu, 08 May 2014 18:50:51 +0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.5.0 |
08.05.2014 17:36, Paolo Bonzini wrote:
> From: Michael Tokarev <address@hidden>
>
> Currently all what's needed for single file libcacard/vcard_emul_nss.c
> (libnss cflags) and hw/usb/ccid-card-emulated.c (libcacard includes)
> together with the libs is added to global QEMU_CFLAGS and libs_softmmu.
>
> Use the cflags only where really used (for two mentioned files), and
> libs only where needed.
>
> While at it, rename variables to better reflect reality: libcacard_*
> is really nss_*.
>
> This needs a bit more tweaking: $(NSS_LIBS) should not contain $glib_libs
> (ditto for _cflags). But in order to fix it, some more preparations
> should be made first. So add a FIXME comment.
[]
> 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"
glib_cflags isn't needed here, only glib_libs. Or else glib_cflags is
added twice (doen't hurt, just bigger command line)
FWIW.
Thanks,
/mjt
- [Qemu-devel] [PATCH 00/10] build: pending fixes and improvements, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 01/10] build: Fix per-object variables for Makefile.target, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL), Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 04/10] Makefile: strip tools and modules too, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG), Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 03/10] build: simplify Makefile.target around unnest-vars invocations, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 07/10] build: add support for per-object -cflags and -libs to all rules, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax, Paolo Bonzini, 2014/05/08
- [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars, Paolo Bonzini, 2014/05/08
- Re: [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars,
Michael Tokarev <=
- [Qemu-devel] [PATCH 09/10] build: simplify and fix fix-obj-vars, Paolo Bonzini, 2014/05/08