[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed |
Date: |
Sun, 23 Dec 2012 15:26:25 -0600 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
Robert Schiele <address@hidden> 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 <address@hidden>
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