From patchwork Tue Nov 13 08:42:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 198593 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 422EC2C00AC for ; Tue, 13 Nov 2012 20:21:27 +1100 (EST) Received: from localhost ([::1]:37437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYC5P-0004WW-CR for incoming@patchwork.ozlabs.org; Tue, 13 Nov 2012 03:43:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYC4Z-0002Tk-IU for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYC4W-00012H-GF for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYC4W-00011f-7b for qemu-devel@nongnu.org; Tue, 13 Nov 2012 03:42:16 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAD8gFKQ028055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Nov 2012 03:42:15 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAD8gEOS028353; Tue, 13 Nov 2012 03:42:14 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id A86A24087C; Tue, 13 Nov 2012 09:42:13 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 13 Nov 2012 09:42:09 +0100 Message-Id: <1352796133-956-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1352796133-956-1-git-send-email-kraxel@redhat.com> References: <1352796133-956-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/6] pixman: pass tools to configure 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 Complete the set of compiler tool names in config-host.mak, pass them to pixman configure to make sure cross builds work. Based on a patch from Blue Swirl. Signed-off-by: Gerd Hoffmann --- Makefile | 2 +- configure | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ca14a21..7b267c9 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 18faded..e7ca78b 100755 --- a/configure +++ b/configure @@ -252,8 +252,10 @@ done cc="${CC-${cross_prefix}gcc}" ar="${AR-${cross_prefix}ar}" +nm="${AR-${cross_prefix}nm}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" +ranlib="${LD-${cross_prefix}ranlib}" libtool="${LIBTOOL-${cross_prefix}libtool}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" @@ -3635,8 +3637,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