From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:46410)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Tmt43-0007YA-Jz
	for qemu-devel@nongnu.org; Sun, 23 Dec 2012 16:26:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Tmt40-0002oE-5j
	for qemu-devel@nongnu.org; Sun, 23 Dec 2012 16:26:31 -0500
Received: from mail-oa0-f51.google.com ([209.85.219.51]:38305)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1Tmt3z-0002o6-Uc
	for qemu-devel@nongnu.org; Sun, 23 Dec 2012 16:26:28 -0500
Received: by mail-oa0-f51.google.com with SMTP id n12so6370353oag.10
	for <qemu-devel@nongnu.org>; Sun, 23 Dec 2012 13:26:27 -0800 (PST)
From: Anthony Liguori <anthony@codemonkey.ws>
In-Reply-To: <20121204155808.GA20132@linux-e1lq.nsn-intra.net>
References: <20121204155808.GA20132@linux-e1lq.nsn-intra.net>
Date: Sun, 23 Dec 2012 15:26:25 -0600
Message-ID: <87k3s8tq7y.fsf@codemonkey.ws>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not
	needed
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Robert Schiele <rschiele@gmail.com>, qemu-devel@nongnu.org

Robert Schiele <rschiele@gmail.com> writes:

> When we build neither any system emulation targets nor the tools there
> is actually no need for pixman library.  In that case do not enforce
> presence of that library on the system.
>
> Signed-off-by: Robert Schiele <rschiele@gmail.com>

Applied. Thanks.

Regards,

Anthony Liguori

> ---
> This allows to reduce dependencies in case you build only user
> emulation targets.
>
>  configure                 |   18 ++++++++++++++++--
>  target-unicore32/helper.c |    2 ++
>  2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 994f731..7043b5a 100755
> --- a/configure
> +++ b/configure
> @@ -647,6 +647,8 @@ for opt do
>    ;;
>    --without-system-pixman) pixman="internal"
>    ;;
> +  --without-pixman) pixman="none"
> +  ;;
>    --disable-sdl) sdl="no"
>    ;;
>    --enable-sdl) sdl="yes"
> @@ -2118,13 +2120,25 @@ fi
>  # pixman support probe
>  
>  if test "$pixman" = ""; then
> -  if $pkg_config pixman-1 > /dev/null 2>&1; then
> +  if test "$want_tools" = "no" -a "$softmmu" = "no"; then
> +    pixman="none"
> +  elif $pkg_config pixman-1 > /dev/null 2>&1; then
>      pixman="system"
>    else
>      pixman="internal"
>    fi
>  fi
> -if test "$pixman" = "system"; then
> +if test "$pixman" = "none"; then
> +  if test "$want_tools" != "no" -o "$softmmu" != "no"; then
> +    echo "ERROR: pixman disabled but system emulation or tools build"
> +    echo "       enabled.  You can turn off pixman only if you also"
> +    echo "       disable all system emulation targets and the tools"
> +    echo "       build with '--disable-tools --disable-system'."
> +    exit 1
> +  fi
> +  pixman_cflags=
> +  pixman_libs=
> +elif test "$pixman" = "system"; then
>    pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`
>    pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`
>  else
> diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
> index a9e226b..3e0df33 100644
> --- a/target-unicore32/helper.c
> +++ b/target-unicore32/helper.c
> @@ -13,7 +13,9 @@
>  #include "gdbstub.h"
>  #include "helper.h"
>  #include "host-utils.h"
> +#ifndef CONFIG_USER_ONLY
>  #include "console.h"
> +#endif
>  
>  #undef DEBUG_UC32
>  
> -- 
> 1.7.10.4