From patchwork Tue Dec 4 15:58:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Schiele X-Patchwork-Id: 203684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 822782C008F for ; Wed, 5 Dec 2012 02:58:37 +1100 (EST) Received: from localhost ([::1]:42550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfutH-0007xf-OJ for incoming@patchwork.ozlabs.org; Tue, 04 Dec 2012 10:58:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tfut5-0007vW-Kj for qemu-devel@nongnu.org; Tue, 04 Dec 2012 10:58:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tfusw-0000DA-JH for qemu-devel@nongnu.org; Tue, 04 Dec 2012 10:58:23 -0500 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:12907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tfusw-0000Cl-8v for qemu-devel@nongnu.org; Tue, 04 Dec 2012 10:58:14 -0500 Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd001.nsn-inter.net (8.12.11.20060308/8.12.11) with ESMTP id qB4FwCja021425 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 4 Dec 2012 16:58:13 +0100 Received: from linux-e1lq.site ([10.151.19.96]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id qB4FwCSQ000728 for ; Tue, 4 Dec 2012 16:58:12 +0100 Received: by linux-e1lq.site (Postfix, from userid 1000) id 38D8C2D1; Tue, 4 Dec 2012 16:58:08 +0100 (CET) Date: Tue, 4 Dec 2012 16:58:08 +0100 From: Robert Schiele To: qemu-devel@nongnu.org Message-ID: <20121204155808.GA20132@linux-e1lq.nsn-intra.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 2104 X-purgate-ID: 151667::1354636693-00006291-47BA8BDD/0-0/0-0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 93.183.12.32 Subject: [Qemu-devel] [PATCH] configure: allow disabling pixman if not needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Andreas Färber --- 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