* [Qemu-devel] [PATCH] libcacard configure fixes
@ 2012-02-09 19:05 Paul Brook
2012-02-09 20:03 ` Andreas Färber
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Paul Brook @ 2012-02-09 19:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Paul Brook
libcacard is only used by system emulation.
Only define libcacard_libs/cflags once.
Signed-off-by: Paul Brook <paul@codesourcery.com>
---
configure | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 763db24..faa65a8 100755
--- a/configure
+++ b/configure
@@ -2569,7 +2569,7 @@ EOF
compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
smartcard_nss="yes"
QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
- LIBS="$libcacard_libs $LIBS"
+ libs_softmmu="$libcacard_libs $libs_softmmu"
else
if test "$smartcard_nss" = "yes"; then
feature_not_found "nss"
@@ -3209,6 +3209,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
fi
if test "$usb_redir" = "yes" ; then
@@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then
echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
+ if test "$smartcard_nss" = "yes" ; then
+ echo "subdir-$target: subdir-libcacard" >> $config_host_mak
+ fi
fi
if test "$target_user_only" = "yes" ; then
echo "CONFIG_USER_ONLY=y" >> $config_target_mak
@@ -3639,11 +3644,6 @@ fi
if test "$target_darwin_user" = "yes" ; then
echo "CONFIG_DARWIN_USER=y" >> $config_target_mak
fi
-if test "$smartcard_nss" = "yes" ; then
- echo "subdir-$target: subdir-libcacard" >> $config_host_mak
- echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
- echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
-fi
list=""
if test ! -z "$gdb_xml_files" ; then
for x in $gdb_xml_files; do
--
1.7.8.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] libcacard configure fixes
2012-02-09 19:05 [Qemu-devel] [PATCH] libcacard configure fixes Paul Brook
@ 2012-02-09 20:03 ` Andreas Färber
2012-02-12 11:21 ` Alon Levy
2012-02-17 18:16 ` Anthony Liguori
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Färber @ 2012-02-09 20:03 UTC (permalink / raw)
To: Paul Brook; +Cc: Alon Levy, qemu-devel
Am 09.02.2012 20:05, schrieb Paul Brook:
> libcacard is only used by system emulation.
> Only define libcacard_libs/cflags once.
>
> Signed-off-by: Paul Brook <paul@codesourcery.com>
Looks okay on first sight, but Alon (cc'ed) may want to check.
Andreas
> ---
> configure | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index 763db24..faa65a8 100755
> --- a/configure
> +++ b/configure
> @@ -2569,7 +2569,7 @@ EOF
> compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
> smartcard_nss="yes"
> QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
> - LIBS="$libcacard_libs $LIBS"
> + libs_softmmu="$libcacard_libs $libs_softmmu"
> else
> if test "$smartcard_nss" = "yes"; then
> feature_not_found "nss"
> @@ -3209,6 +3209,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
> fi
>
> if test "$usb_redir" = "yes" ; then
> @@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then
> echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
> echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
> echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
> + if test "$smartcard_nss" = "yes" ; then
> + echo "subdir-$target: subdir-libcacard" >> $config_host_mak
> + fi
> fi
> if test "$target_user_only" = "yes" ; then
> echo "CONFIG_USER_ONLY=y" >> $config_target_mak
> @@ -3639,11 +3644,6 @@ fi
> if test "$target_darwin_user" = "yes" ; then
> echo "CONFIG_DARWIN_USER=y" >> $config_target_mak
> fi
> -if test "$smartcard_nss" = "yes" ; then
> - echo "subdir-$target: subdir-libcacard" >> $config_host_mak
> - echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
> - echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
> -fi
> list=""
> if test ! -z "$gdb_xml_files" ; then
> for x in $gdb_xml_files; do
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] libcacard configure fixes
2012-02-09 19:05 [Qemu-devel] [PATCH] libcacard configure fixes Paul Brook
2012-02-09 20:03 ` Andreas Färber
@ 2012-02-12 11:21 ` Alon Levy
2012-02-17 18:16 ` Anthony Liguori
2 siblings, 0 replies; 5+ messages in thread
From: Alon Levy @ 2012-02-12 11:21 UTC (permalink / raw)
To: Anthony Liguori, Paul Brook; +Cc: qemu-devel
On Thu, Feb 09, 2012 at 07:05:29PM +0000, Paul Brook wrote:
> libcacard is only used by system emulation.
> Only define libcacard_libs/cflags once.
>
ACK.
Anthony, do you want a single patch pull request in general or is it ok
to ask that you pick this directly?
Alon
> Signed-off-by: Paul Brook <paul@codesourcery.com>
> ---
> configure | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index 763db24..faa65a8 100755
> --- a/configure
> +++ b/configure
> @@ -2569,7 +2569,7 @@ EOF
> compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
> smartcard_nss="yes"
> QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
> - LIBS="$libcacard_libs $LIBS"
> + libs_softmmu="$libcacard_libs $libs_softmmu"
> else
> if test "$smartcard_nss" = "yes"; then
> feature_not_found "nss"
> @@ -3209,6 +3209,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
> fi
>
> if test "$usb_redir" = "yes" ; then
> @@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then
> echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
> echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
> echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
> + if test "$smartcard_nss" = "yes" ; then
> + echo "subdir-$target: subdir-libcacard" >> $config_host_mak
> + fi
> fi
> if test "$target_user_only" = "yes" ; then
> echo "CONFIG_USER_ONLY=y" >> $config_target_mak
> @@ -3639,11 +3644,6 @@ fi
> if test "$target_darwin_user" = "yes" ; then
> echo "CONFIG_DARWIN_USER=y" >> $config_target_mak
> fi
> -if test "$smartcard_nss" = "yes" ; then
> - echo "subdir-$target: subdir-libcacard" >> $config_host_mak
> - echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
> - echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
> -fi
> list=""
> if test ! -z "$gdb_xml_files" ; then
> for x in $gdb_xml_files; do
> --
> 1.7.8.3
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] libcacard configure fixes
2012-02-09 19:05 [Qemu-devel] [PATCH] libcacard configure fixes Paul Brook
2012-02-09 20:03 ` Andreas Färber
2012-02-12 11:21 ` Alon Levy
@ 2012-02-17 18:16 ` Anthony Liguori
2012-02-17 19:18 ` Alon Levy
2 siblings, 1 reply; 5+ messages in thread
From: Anthony Liguori @ 2012-02-17 18:16 UTC (permalink / raw)
To: Paul Brook; +Cc: qemu-devel
On 02/09/2012 01:05 PM, Paul Brook wrote:
> libcacard is only used by system emulation.
> Only define libcacard_libs/cflags once.
>
> Signed-off-by: Paul Brook<paul@codesourcery.com>
Ah, I applied this without realizing it was from pbrook :-)
Regards,
Anthony Liguori
> ---
> configure | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index 763db24..faa65a8 100755
> --- a/configure
> +++ b/configure
> @@ -2569,7 +2569,7 @@ EOF
> compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
> smartcard_nss="yes"
> QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
> - LIBS="$libcacard_libs $LIBS"
> + libs_softmmu="$libcacard_libs $libs_softmmu"
> else
> if test "$smartcard_nss" = "yes"; then
> feature_not_found "nss"
> @@ -3209,6 +3209,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
> fi
>
> if test "$usb_redir" = "yes" ; then
> @@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then
> echo "LIBS+=$libs_softmmu $target_libs_softmmu">> $config_target_mak
> echo "HWDIR=../libhw$target_phys_bits">> $config_target_mak
> echo "subdir-$target: subdir-libhw$target_phys_bits">> $config_host_mak
> + if test "$smartcard_nss" = "yes" ; then
> + echo "subdir-$target: subdir-libcacard">> $config_host_mak
> + fi
> fi
> if test "$target_user_only" = "yes" ; then
> echo "CONFIG_USER_ONLY=y">> $config_target_mak
> @@ -3639,11 +3644,6 @@ fi
> if test "$target_darwin_user" = "yes" ; then
> echo "CONFIG_DARWIN_USER=y">> $config_target_mak
> fi
> -if test "$smartcard_nss" = "yes" ; then
> - echo "subdir-$target: subdir-libcacard">> $config_host_mak
> - echo "libcacard_libs=$libcacard_libs">> $config_host_mak
> - echo "libcacard_cflags=$libcacard_cflags">> $config_host_mak
> -fi
> list=""
> if test ! -z "$gdb_xml_files" ; then
> for x in $gdb_xml_files; do
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] libcacard configure fixes
2012-02-17 18:16 ` Anthony Liguori
@ 2012-02-17 19:18 ` Alon Levy
0 siblings, 0 replies; 5+ messages in thread
From: Alon Levy @ 2012-02-17 19:18 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paul Brook, qemu-devel
On Fri, Feb 17, 2012 at 12:16:53PM -0600, Anthony Liguori wrote:
> On 02/09/2012 01:05 PM, Paul Brook wrote:
> >libcacard is only used by system emulation.
> >Only define libcacard_libs/cflags once.
> >
> >Signed-off-by: Paul Brook<paul@codesourcery.com>
>
> Ah, I applied this without realizing it was from pbrook :-)
>
Fine by me.
> Regards,
>
> Anthony Liguori
>
> >---
> > configure | 12 ++++++------
> > 1 files changed, 6 insertions(+), 6 deletions(-)
> >
> >diff --git a/configure b/configure
> >index 763db24..faa65a8 100755
> >--- a/configure
> >+++ b/configure
> >@@ -2569,7 +2569,7 @@ EOF
> > compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then
> > smartcard_nss="yes"
> > QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags"
> >- LIBS="$libcacard_libs $LIBS"
> >+ libs_softmmu="$libcacard_libs $libs_softmmu"
> > else
> > if test "$smartcard_nss" = "yes"; then
> > feature_not_found "nss"
> >@@ -3209,6 +3209,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
> > fi
> >
> > if test "$usb_redir" = "yes" ; then
> >@@ -3628,6 +3630,9 @@ if test "$target_softmmu" = "yes" ; then
> > echo "LIBS+=$libs_softmmu $target_libs_softmmu">> $config_target_mak
> > echo "HWDIR=../libhw$target_phys_bits">> $config_target_mak
> > echo "subdir-$target: subdir-libhw$target_phys_bits">> $config_host_mak
> >+ if test "$smartcard_nss" = "yes" ; then
> >+ echo "subdir-$target: subdir-libcacard">> $config_host_mak
> >+ fi
> > fi
> > if test "$target_user_only" = "yes" ; then
> > echo "CONFIG_USER_ONLY=y">> $config_target_mak
> >@@ -3639,11 +3644,6 @@ fi
> > if test "$target_darwin_user" = "yes" ; then
> > echo "CONFIG_DARWIN_USER=y">> $config_target_mak
> > fi
> >-if test "$smartcard_nss" = "yes" ; then
> >- echo "subdir-$target: subdir-libcacard">> $config_host_mak
> >- echo "libcacard_libs=$libcacard_libs">> $config_host_mak
> >- echo "libcacard_cflags=$libcacard_cflags">> $config_host_mak
> >-fi
> > list=""
> > if test ! -z "$gdb_xml_files" ; then
> > for x in $gdb_xml_files; do
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-02-17 19:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-09 19:05 [Qemu-devel] [PATCH] libcacard configure fixes Paul Brook
2012-02-09 20:03 ` Andreas Färber
2012-02-12 11:21 ` Alon Levy
2012-02-17 18:16 ` Anthony Liguori
2012-02-17 19:18 ` Alon Levy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.