Patchwork [1/4] build: move around libcacard-y definition

login
register
mail settings
Submitter Paolo Bonzini
Date Jan. 19, 2013, 10:06 a.m.
Message ID <1358590008-1681-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/213814/
State New
Headers show

Comments

Paolo Bonzini - Jan. 19, 2013, 10:06 a.m.
It is also needed if !CONFIG_SOFTMMU, unlike everything that surrounds it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile.objs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
Andreas Färber - Jan. 19, 2013, 6:05 p.m.
Am 19.01.2013 11:06, schrieb Paolo Bonzini:
> It is also needed if !CONFIG_SOFTMMU, unlike everything that surrounds it.

Why? linux-user should not depend on it - bad wording only?

Andreas

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile.objs |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index d465a72..3548f9b 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -34,6 +34,15 @@ CONFIG_REALLY_VIRTFS=y
>  endif
>  
>  ######################################################################
> +# smartcard
> +
> +libcacard-y += libcacard/cac.o libcacard/event.o
> +libcacard-y += libcacard/vcard.o libcacard/vreader.o
> +libcacard-y += libcacard/vcard_emul_nss.o
> +libcacard-y += libcacard/vcard_emul_type.o
> +libcacard-y += libcacard/card_7816.o
> +
> +######################################################################
>  # Target independent part of system emulation. The long term path is to
>  # suppress *all* target specific code in case of system emulation, i.e. a
>  # single QEMU executable should support all CPUs and machines.
> @@ -77,15 +86,6 @@ ifeq ($(CONFIG_SECCOMP),y)
>  common-obj-y += qemu-seccomp.o
>  endif
>  
> -######################################################################
> -# smartcard
> -
> -libcacard-y += libcacard/cac.o libcacard/event.o
> -libcacard-y += libcacard/vcard.o libcacard/vreader.o
> -libcacard-y += libcacard/vcard_emul_nss.o
> -libcacard-y += libcacard/vcard_emul_type.o
> -libcacard-y += libcacard/card_7816.o
> -
>  common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
>  
>  ######################################################################
>
Paolo Bonzini - Jan. 19, 2013, 10:01 p.m.
Il 19/01/2013 19:05, Andreas Färber ha scritto:
> Am 19.01.2013 11:06, schrieb Paolo Bonzini:
>> > It is also needed if !CONFIG_SOFTMMU, unlike everything that surrounds it.
> Why? linux-user should not depend on it - bad wording only?

It is needed by libcacard/Makefile.  You can build it even if you do not
configure any softmmu target.

Paolo
Andreas Färber - Jan. 19, 2013, 11:26 p.m.
Am 19.01.2013 23:01, schrieb Paolo Bonzini:
> Il 19/01/2013 19:05, Andreas Färber ha scritto:
>> Am 19.01.2013 11:06, schrieb Paolo Bonzini:
>>>> It is also needed if !CONFIG_SOFTMMU, unlike everything that surrounds it.
>> Why? linux-user should not depend on it - bad wording only?
> 
> It is needed by libcacard/Makefile.  You can build it even if you do not
> configure any softmmu target.

Suggest wording: "It is also valid to build libcacard if
!CONFIG_SOFTMMU, unlike everything that surrounds it." or so
(avoids "also *needed* if !CONFIG_SOFTMMU" which wrongly suggested to me
!CONFIG_SOFTMMU == CONFIG_USER_ONLY)

Andreas
Blue Swirl - Jan. 26, 2013, 3:06 p.m.
Thanks, applied all.

On Sat, Jan 19, 2013 at 10:06 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> It is also needed if !CONFIG_SOFTMMU, unlike everything that surrounds it.
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile.objs |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index d465a72..3548f9b 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -34,6 +34,15 @@ CONFIG_REALLY_VIRTFS=y
>  endif
>
>  ######################################################################
> +# smartcard
> +
> +libcacard-y += libcacard/cac.o libcacard/event.o
> +libcacard-y += libcacard/vcard.o libcacard/vreader.o
> +libcacard-y += libcacard/vcard_emul_nss.o
> +libcacard-y += libcacard/vcard_emul_type.o
> +libcacard-y += libcacard/card_7816.o
> +
> +######################################################################
>  # Target independent part of system emulation. The long term path is to
>  # suppress *all* target specific code in case of system emulation, i.e. a
>  # single QEMU executable should support all CPUs and machines.
> @@ -77,15 +86,6 @@ ifeq ($(CONFIG_SECCOMP),y)
>  common-obj-y += qemu-seccomp.o
>  endif
>
> -######################################################################
> -# smartcard
> -
> -libcacard-y += libcacard/cac.o libcacard/event.o
> -libcacard-y += libcacard/vcard.o libcacard/vreader.o
> -libcacard-y += libcacard/vcard_emul_nss.o
> -libcacard-y += libcacard/vcard_emul_type.o
> -libcacard-y += libcacard/card_7816.o
> -
>  common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
>
>  ######################################################################
> --
> 1.7.1
>
>

Patch

diff --git a/Makefile.objs b/Makefile.objs
index d465a72..3548f9b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -34,6 +34,15 @@  CONFIG_REALLY_VIRTFS=y
 endif
 
 ######################################################################
+# smartcard
+
+libcacard-y += libcacard/cac.o libcacard/event.o
+libcacard-y += libcacard/vcard.o libcacard/vreader.o
+libcacard-y += libcacard/vcard_emul_nss.o
+libcacard-y += libcacard/vcard_emul_type.o
+libcacard-y += libcacard/card_7816.o
+
+######################################################################
 # Target independent part of system emulation. The long term path is to
 # suppress *all* target specific code in case of system emulation, i.e. a
 # single QEMU executable should support all CPUs and machines.
@@ -77,15 +86,6 @@  ifeq ($(CONFIG_SECCOMP),y)
 common-obj-y += qemu-seccomp.o
 endif
 
-######################################################################
-# smartcard
-
-libcacard-y += libcacard/cac.o libcacard/event.o
-libcacard-y += libcacard/vcard.o libcacard/vreader.o
-libcacard-y += libcacard/vcard_emul_nss.o
-libcacard-y += libcacard/vcard_emul_type.o
-libcacard-y += libcacard/card_7816.o
-
 common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
 
 ######################################################################