Re: [Qemu-devel] [PATCH] Fix out-of-tree and cross compile builds for pixman

[Johnson, Eric]

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: address@hidden [mailto:qemu-devel-
> address@hidden On Behalf Of Gerd Hoffmann
> Sent: Wednesday, November 07, 2012 3:43 AM
> To: Blue Swirl
> Cc: Peter Maydell; address@hidden
> 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 <address@hidden>
> wrote:
> >> On 3 November 2012 19:47, Blue Swirl <address@hidden> 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
>