From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tg2tl-0001V3-Nf for qemu-devel@nongnu.org; Tue, 04 Dec 2012 19:31:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tg2tk-0004dB-Ag for qemu-devel@nongnu.org; Tue, 04 Dec 2012 19:31:37 -0500 Received: from cantor2.suse.de ([195.135.220.15]:60622 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfvFd-0007Yn-PR for qemu-devel@nongnu.org; Tue, 04 Dec 2012 11:21:42 -0500 Message-ID: <50BE2312.4080005@suse.de> Date: Tue, 04 Dec 2012 17:21:38 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <20121204155808.GA20132@linux-e1lq.nsn-intra.net> In-Reply-To: <20121204155808.GA20132@linux-e1lq.nsn-intra.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Robert Schiele Cc: qemu-devel@nongnu.org, 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. >=20 > Signed-off-by: Robert Schiele Reviewed-by: Andreas F=E4rber 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. >=20 > configure | 18 ++++++++++++++++-- > target-unicore32/helper.c | 2 ++ > 2 files changed, 18 insertions(+), 2 deletions(-) >=20 > 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=3D"internal" > ;; > + --without-pixman) pixman=3D"none" > + ;; > --disable-sdl) sdl=3D"no" > ;; > --enable-sdl) sdl=3D"yes" > @@ -2118,13 +2120,25 @@ fi > # pixman support probe > =20 > if test "$pixman" =3D ""; then > - if $pkg_config pixman-1 > /dev/null 2>&1; then > + if test "$want_tools" =3D "no" -a "$softmmu" =3D "no"; then > + pixman=3D"none" > + elif $pkg_config pixman-1 > /dev/null 2>&1; then > pixman=3D"system" > else > pixman=3D"internal" > fi > fi > -if test "$pixman" =3D "system"; then > +if test "$pixman" =3D "none"; then > + if test "$want_tools" !=3D "no" -o "$softmmu" !=3D "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=3D > + pixman_libs=3D > +elif test "$pixman" =3D "system"; then > pixman_cflags=3D`$pkg_config --cflags pixman-1 2>/dev/null` > pixman_libs=3D`$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 > =20 > #undef DEBUG_UC32 > =20 >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg