* [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed
@ 2012-12-04 15:58 Robert Schiele
2012-12-04 16:20 ` Peter Maydell
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Robert Schiele @ 2012-12-04 15:58 UTC (permalink / raw)
To: qemu-devel
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed
2012-12-04 15:58 [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed Robert Schiele
@ 2012-12-04 16:20 ` Peter Maydell
2012-12-04 16:21 ` Andreas Färber
2012-12-23 21:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2012-12-04 16:20 UTC (permalink / raw)
To: Robert Schiele; +Cc: qemu-devel
On 4 December 2012 15:58, Robert Schiele <rschiele@gmail.com> wrote:
> 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
I said at the time that target-* including console.h
was broken; and look, now we wind up with ugliness here.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed
2012-12-04 15:58 [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed Robert Schiele
2012-12-04 16:20 ` Peter Maydell
@ 2012-12-04 16:21 ` Andreas Färber
2012-12-23 21:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2012-12-04 16:21 UTC (permalink / raw)
To: Robert Schiele; +Cc: qemu-devel, Gerd Hoffmann
Am 04.12.2012 16:58, schrieb Robert Schiele:
> 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>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Thanks for catching this. We usually build from the same .spec in two
passes so don't notice. There's probably more unnecessary dependencies
that could get thrown out for *-user if you so wanted.
Cheers,
Andreas
> ---
> 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
>
>
--
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] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed
2012-12-04 15:58 [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed Robert Schiele
2012-12-04 16:20 ` Peter Maydell
2012-12-04 16:21 ` Andreas Färber
@ 2012-12-23 21:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2012-12-23 21:26 UTC (permalink / raw)
To: Robert Schiele, qemu-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-23 21:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-04 15:58 [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed Robert Schiele
2012-12-04 16:20 ` Peter Maydell
2012-12-04 16:21 ` Andreas Färber
2012-12-23 21:26 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).