From patchwork Wed Nov 7 20:57:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Johnson X-Patchwork-Id: 197729 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 6F1C52C009F for ; Thu, 8 Nov 2012 07:57:30 +1100 (EST) Received: from localhost ([::1]:36868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWCgh-00031e-6H for incoming@patchwork.ozlabs.org; Wed, 07 Nov 2012 15:57:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWCgZ-000315-2j for qemu-devel@nongnu.org; Wed, 07 Nov 2012 15:57:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWCgX-0001UB-Gt for qemu-devel@nongnu.org; Wed, 07 Nov 2012 15:57:18 -0500 Received: from dns1.mips.com ([12.201.5.69]:45446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWCgX-0001Ty-4T for qemu-devel@nongnu.org; Wed, 07 Nov 2012 15:57:17 -0500 Received: from mailgate1.mips.com (mailgate1.mips.com [12.201.5.111]) by dns1.mips.com (8.13.8/8.13.8) with ESMTP id qA7KvDL1018191; Wed, 7 Nov 2012 12:57:13 -0800 X-WSS-ID: 0MD4Y7D-01-5U3-02 X-M-MSG: Received: from exchdb01.mips.com (unknown [192.168.36.84]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mailgate1.mips.com (Postfix) with ESMTP id 21D82364652; Wed, 7 Nov 2012 12:57:12 -0800 (PST) Received: from EXCHDB03.MIPS.com ([fe80::6df1:ae84:797e:9076]) by exchhub01.mips.com ([::1]) with mapi id 14.01.0270.001; Wed, 7 Nov 2012 12:57:10 -0800 From: "Johnson, Eric" To: Gerd Hoffmann , Blue Swirl Thread-Topic: [Qemu-devel] [PATCH] Fix out-of-tree and cross compile builds for pixman Thread-Index: AQHNvN0hJWjflpaZYkmLNeqzCGBXtZfezMYAgAAFIQA= Date: Wed, 7 Nov 2012 20:57:10 +0000 Message-ID: References: <2927d80bed65c6e77cab02c82eaf92e50c454b68.1351968408.git.blauwirbel@gmail.com> <509A4959.5030802@redhat.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.16.149] x-ems-proccessed: 6LP3oGfGVdcdb8o1aBnt6w== x-ems-stamp: bEiPVDTJ3XBkPUitUGJhdg== MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 12.201.5.69 Cc: Peter Maydell , "qemu-devel@nongnu.org" Subject: Re: [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 Sorry, I didn’t let the make finish but I think there will be linking errors with the previous because libpixman-1.a may not be built. The following changes to Gerd's rebase/pixman branch will completely build (except s390x). On RHEL 5.7 (no pixman on system): $ ../kraxel.org/configure --without-system-pixman $ make -k -j8 cc1: warnings being treated as errors /home/ericj/work/qemu/kraxel.org/hw/s390x/event-facility.c: In function 'command_handler': /home/ericj/work/qemu/kraxel.org/hw/s390x/event-facility.c:110: warning: 'rc' may be used uninitialized in this function make[1]: *** [hw/s390x/event-facility.o] Error 1 > -----Original Message----- > From: qemu-devel-bounces+ericj=mips.com@nongnu.org [mailto:qemu-devel- > bounces+ericj=mips.com@nongnu.org] On Behalf Of Johnson, Eric > Sent: Wednesday, November 07, 2012 12:07 PM > To: Gerd Hoffmann; Blue Swirl > Cc: Peter Maydell; qemu-devel@nongnu.org > Subject: Re: [Qemu-devel] [PATCH] Fix out-of-tree and cross compile builds > for pixman > > This may not be the prettiest fix for the pixman dependency but it seems > to work. > > diff --git a/configure b/configure > index f0bc726..fcb744e 100755 > --- a/configure > +++ b/configure > @@ -4154,6 +4154,10 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak > echo "QEMU_INCLUDES+=$includes" >> $config_target_mak > > done # for target in $targets > + > +if [ "$pixman" = "internal" ]; then > + echo "config-host.h: pixman/Makefile" >> $config_host_mak > +fi > > # build tree in object directory in case the source is not in the current > directory > DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" > > > -----Original Message----- > > From: qemu-devel-bounces+ericj=mips.com@nongnu.org [mailto:qemu-devel- > > bounces+ericj=mips.com@nongnu.org] On Behalf Of Gerd Hoffmann > > Sent: Wednesday, November 07, 2012 3:43 AM > > To: Blue Swirl > > Cc: Peter Maydell; qemu-devel@nongnu.org > > Subject: Re: [Qemu-devel] [PATCH] Fix out-of-tree and cross compile > builds > > for pixman > > > > On 11/03/12 21:15, Blue Swirl wrote: > > > On Sat, Nov 3, 2012 at 7:02 PM, Peter Maydell > > > wrote: > > >> On 3 November 2012 19:47, Blue Swirl wrote: > > >>> --- 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) > > >> > > >> Not tested, but aren't there quoting issues here if you're > > >> building with --cc='ccache gcc' ? > > > > > > Yes. Also configure fails because the variables are not expanded and > > > directory pixman/pixman does not exist. Funny how it worked earlier. > > > > Turned out part of the issue is that having pixman-devel installed > > masked some of the build issues of the internal pixman even when > > building --without-pixman-system, so my build testing was incomplete. > > > > Pushed test branch: > > git://git.kraxel.org/qemu rebase/pixman > > > > Dependency issue isn't tackled yet, but non-parallel builds are working > > fine for me. Feedback is welcome. > > > > cheers, > > Gerd > > diff --git a/configure b/configure index f0bc726..d946937 100755 --- a/configure +++ b/configure @@ -3955,9 +3955,6 @@ if test "$target_softmmu" = "yes" ; then if test "$smartcard_nss" = "yes" ; then echo "subdir-$target: subdir-libcacard" >> $config_host_mak fi - if test "$pixman" = "internal" ; then - echo "subdir-$target: subdir-pixman" >> $config_host_mak - fi case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak @@ -4154,6 +4151,10 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak echo "QEMU_INCLUDES+=$includes" >> $config_target_mak done # for target in $targets + +if [ "$pixman" = "internal" ]; then + echo "config-host.h: subdir-pixman" >> $config_host_mak +fi # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32"