From patchwork Sat Nov 3 18:47:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 196917 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 19BB02C00D0 for ; Sun, 4 Nov 2012 05:48:09 +1100 (EST) Received: from localhost ([::1]:55620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUilK-0007Bd-5g for incoming@patchwork.ozlabs.org; Sat, 03 Nov 2012 14:48:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUilD-0007BW-GS for qemu-devel@nongnu.org; Sat, 03 Nov 2012 14:48:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUilC-0005qj-5i for qemu-devel@nongnu.org; Sat, 03 Nov 2012 14:47:59 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:41014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUilB-0005qM-Ta for qemu-devel@nongnu.org; Sat, 03 Nov 2012 14:47:58 -0400 Received: by mail-lb0-f173.google.com with SMTP id gj3so3100873lbb.4 for ; Sat, 03 Nov 2012 11:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=a2wlwne9fWdyuLcSjMvUn9yHEOKTPzjsl+uTtc/GF3w=; b=KmoyqoRWcPBeCyw+gDuTtJK6vDusPkctXChgzt8ZInrKbcnncikIruFA39Oa+u+SC+ segOB/YzXMCwra1akpsan/zbeeNgZFmU29P9p667S/FpkvIuoiM4FyFSWPW8XcevN83b qH5u9vWyhazbgwiHqs10dpOKVFGveFR3VLYut38ewxE5WyWNgeXCZpJRm8VpgOZRJDFK hz3i5tQPOMqJG7gBmwY764b4pyBC9ujiSYQHd4bwCzWlecqbCS2GTrn3NatXIijU0uzA OdggLed2Xt4ppU9OR8lJT99f1bR0SvfaBWQmdl4GVsXqOlMnljnqDOAvJJf+pEQbBtGg ei8g== Received: by 10.152.110.74 with SMTP id hy10mr4895262lab.54.1351968476665; Sat, 03 Nov 2012 11:47:56 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1000:b::b867]) by mx.google.com with ESMTPS id f3sm4228018lbm.11.2012.11.03.11.47.53 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 11:47:55 -0700 (PDT) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sat, 3 Nov 2012 18:47:33 +0000 Message-Id: <2927d80bed65c6e77cab02c82eaf92e50c454b68.1351968408.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.173 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH] Fix out-of-tree and cross compile builds for pixman 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 Pass the selected set of compile tools (cc, ld, nm, ar, ranlib) to pixman configure. Fix out-of-tree compiler paths so that pixman-version.h in build directory can be found. Signed-off-by: Blue Swirl --- Makefile | 2 +- configure | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ca14a21..15a3080 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ subdir-pixman: pixman/Makefile $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; $(SRC_PATH)/pixman/configure --disable-shared --enable-static) + (cd pixman; CC=$(CC) LD=$(LD) AR=$(AR) NM=$(NM) RANLIB=$(RANLIB) $(SRC_PATH)/pixman/configure --disable-shared --enable-static) $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) diff --git a/configure b/configure index b6948f7..42c958d 100755 --- a/configure +++ b/configure @@ -252,9 +252,11 @@ done cc="${CC-${cross_prefix}gcc}" ar="${AR-${cross_prefix}ar}" +nm="${NM-${cross_prefix}nm}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" libtool="${LIBTOOL-${cross_prefix}libtool}" +ranlib="${RANLIB-${cross_prefix}ranlib}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" @@ -2121,8 +2123,8 @@ else echo " git submodule update --init pixman" exit 1 fi - pixman_cflags="-I${source_path}/pixman/pixman" - pixman_libs="-Lpixman/pixman/.libs -lpixman-1" + pixman_cflags="-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman" + pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1" fi QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" libs_softmmu="$libs_softmmu $pixman_libs" @@ -3634,8 +3636,10 @@ echo "CC_I386=$cc_i386" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak echo "OBJCC=$objcc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak +echo "NM=$nm" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak +echo "RANLIB=$ranlib" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "LIBTOOL=$libtool" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak