From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OAl2s-0002ji-12 for qemu-devel@nongnu.org; Sat, 08 May 2010 10:30:22 -0400 Received: from [140.186.70.92] (port=44861 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAl2q-0002iZ-FI for qemu-devel@nongnu.org; Sat, 08 May 2010 10:30:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAl2n-0003FZ-Tn for qemu-devel@nongnu.org; Sat, 08 May 2010 10:30:20 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:65161) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAl2j-0003Df-Ut for qemu-devel@nongnu.org; Sat, 08 May 2010 10:30:17 -0400 Message-ID: <4BE57564.5030604@mail.berlios.de> Date: Sat, 08 May 2010 16:29:56 +0200 From: Stefan Weil MIME-Version: 1.0 References: <20100409194401.GE21042@volta.aurel32.net> <1271004258-26882-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1271004258-26882-1-git-send-email-weil@mail.berlios.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] Fix cross compilation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno Cc: QEMU Developers Am 11.04.2010 18:44, schrieb Stefan Weil: > This patch enhances the algorithm which finds the correct settings for SDL. > For cross compilations (when cross_prefix is set), it looks for sdl-config > with cross prefix. Here is the complete search order: > > $(cross_prefix}pkg-config (old, only used for cross compilation) > ${cross_prefix}sdl_config (new, only used for cross compilation) > pkg-config (old, needs PATH) > sdl-config (old, needs PATH) > > Cross SDL packages (or the user) now can simply set a link (for example > /usr/bin/i586-mingw32msvc-sdl-config -> /usr/i586-mingw32msvc/bin/sdl-config) > which allows cross compilations without PATH modifications. > > Without the patch, configure and make (which calls configure) typically > need a non-standard PATH. Failing to set this special PATH results in > broken builds. > > v2: > * Favour pkg-config over sdl-config for cross compilations > (suggested by Aurelien Jarno) and add comment for this. > > Cc: Aurelien Jarno > Signed-off-by: Stefan Weil > --- > configure | 12 +++++++++++- > 1 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/configure b/configure > index 966cd7d..47fca4f 100755 > --- a/configure > +++ b/configure > @@ -1064,7 +1064,17 @@ fi > ########################################## > # SDL probe > > -if $pkgconfig sdl --modversion>/dev/null 2>&1; then > +# Look for sdl configuration program (pkg-config or sdl-config). > +# Prefer variant with cross prefix if cross compiling, > +# and favour pkg-config with sdl over sdl-config. > +if test -n "$cross_prefix" -a $pkgconfig != pkg-config&& \ > + $pkgconfig sdl --modversion>/dev/null 2>&1; then > + sdlconfig="$pkgconfig sdl" > + _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` > +elif test -n "$cross_prefix"&& has ${cross_prefix}sdl-config; then > + sdlconfig="${cross_prefix}sdl-config" > + _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` > +elif $pkgconfig sdl --modversion>/dev/null 2>&1; then > sdlconfig="$pkgconfig sdl" > _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` > elif has sdl-config; then > No comments? So this patch can be applied to qemu master? Thanks, Stefan