[Qemu-devel] [PULL 0/6] pixman build fixes

[Qemu-devel] [PULL 0/6] pixman build fixes

[Gerd Hoffmann]

  Hi,

This patch series fixes the build issues with the internal pixman
submodule.  It also adds licensing info to the qemu-pixman.[ch] files.

please pull,
  Gerd

The following changes since commit f5022a135e4309a54d433c69b2a056756b2d0d6b:

  aio: fix aio_ctx_prepare with idle bottom halves (2012-11-12 20:02:09 +0400)

are available in the git repository at:
  git://git.kraxel.org/qemu pixman.v4

Gerd Hoffmann (6):
      pixman: add output dir to include path
      pixman: pass tools to configure
      pixman: disable gtk
      pixman: add pass cflags, add -fPIC
      pixman: build internal version early
      pixman: add licensing info

 Makefile      |    2 +-
 configure     |   17 +++++++++++------
 qemu-pixman.c |    5 +++++
 qemu-pixman.h |    5 +++++
 4 files changed, 22 insertions(+), 7 deletions(-)

[Qemu-devel] [PATCH 1/6] pixman: add output dir to include path

[Gerd Hoffmann]

Needed to make sure the (generated) pixman-version.h file is found.
Based on a patch from Blue Swirl.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 7290f50..18faded 100755
--- a/configure
+++ b/configure
@@ -2121,8 +2121,9 @@ else
     echo "      git submodule update --init pixman"
     exit 1
   fi
-  pixman_cflags="-I${source_path}/pixman/pixman"
-  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
+  mkdir -p pixman/pixman
+  pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman"
+  pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1"
 fi
 QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
 libs_softmmu="$libs_softmmu $pixman_libs"
@@ -4154,7 +4155,6 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS qapi-generated"
 DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
-DIRS="$DIRS pixman"
 FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
 FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
 FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
-- 
1.7.1

[Qemu-devel] [PATCH 2/6] pixman: pass tools to configure

[Gerd Hoffmann]

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 <kraxel@redhat.com>
---
 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
-- 
1.7.1

[Qemu-devel] [PATCH 3/6] pixman: disable gtk

[Gerd Hoffmann]

gtk isn only needed to build test cases.
Disable it to simplify the build.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 7b267c9..0d2ce50 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; CC="$(CC)" LD="$(LD)" AR="$(AR)" NM="$(NM)" RANLIB="$(RANLIB)" $(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-gtk --disable-shared --enable-static)
 
 $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
-- 
1.7.1

[Qemu-devel] [PATCH 4/6] pixman: add pass cflags, add -fPIC

[Gerd Hoffmann]

Pass on CFLAGS to the pixman configure script.
Add -fPIC to the cflags, needed to make the final link succeed.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 0d2ce50..ae4e994 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; CC="$(CC)" LD="$(LD)" AR="$(AR)" NM="$(NM)" RANLIB="$(RANLIB)" $(SRC_PATH)/pixman/configure --disable-gtk --disable-shared --enable-static)
+	(cd pixman; CC="$(CC)" LD="$(LD)" AR="$(AR)" NM="$(NM)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS) -fPIC" $(SRC_PATH)/pixman/configure --disable-gtk --disable-shared --enable-static)
 
 $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
-- 
1.7.1

[Qemu-devel] [PATCH 5/6] pixman: build internal version early

[Gerd Hoffmann]

Patch by Eric Johnson.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index e7ca78b..fb5f002 100755
--- a/configure
+++ b/configure
@@ -3953,9 +3953,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
@@ -4153,6 +4150,10 @@ 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"
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
-- 
1.7.1

[Qemu-devel] [PATCH 6/6] pixman: add licensing info

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qemu-pixman.c |    5 +++++
 qemu-pixman.h |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/qemu-pixman.c b/qemu-pixman.c
index 7547ed7..063b52d 100644
--- a/qemu-pixman.c
+++ b/qemu-pixman.c
@@ -1,3 +1,8 @@
+/*
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include "qemu-pixman.h"
 
 int qemu_pixman_get_type(int rshift, int gshift, int bshift)
diff --git a/qemu-pixman.h b/qemu-pixman.h
index 7652c41..783a392 100644
--- a/qemu-pixman.h
+++ b/qemu-pixman.h
@@ -1,3 +1,8 @@
+/*
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
 #ifndef QEMU_PIXMAN_H
 #define QEMU_PIXMAN_H
 
-- 
1.7.1

Re: [Qemu-devel] [PULL 0/6] pixman build fixes

[Peter Maydell]

On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
> This patch series fixes the build issues with the internal pixman
> submodule.  It also adds licensing info to the qemu-pixman.[ch] files.

These look OK (and I've tested that we can crosscompile using
internal pixman in a separate builddirectory).
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

One remaining problem it would be nice to fix (probably as a
separate patch given this lot is at the pullreq stage):
 "make distclean" in qemu doesn't do a distclean in the pixman/
directory.

-- PMM

Re: [Qemu-devel] [PATCH 2/6] pixman: pass tools to configure

[Stefan Weil]

Am 13.11.2012 09:42, schrieb Gerd Hoffmann:
> 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 <kraxel@redhat.com>
> ---
>   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)

An alternate solution (which works in my build environment) is passing
--host=... (value derived from QEMU cross_prefix) to the pixman configure.


>   
>   $(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}"

NM instead of AR?

>   objcopy="${OBJCOPY-${cross_prefix}objcopy}"
>   ld="${LD-${cross_prefix}ld}"
> +ranlib="${LD-${cross_prefix}ranlib}"

RANLIB instead of LD?

>   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

Re: [Qemu-devel] [PATCH 1/6] pixman: add output dir to include path

[Stefan Weil]

Am 13.11.2012 09:42, schrieb Gerd Hoffmann:
> Needed to make sure the (generated) pixman-version.h file is found.
> Based on a patch from Blue Swirl.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   configure |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 7290f50..18faded 100755
> --- a/configure
> +++ b/configure
> @@ -2121,8 +2121,9 @@ else
>       echo "      git submodule update --init pixman"
>       exit 1
>     fi
> -  pixman_cflags="-I${source_path}/pixman/pixman"
> -  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
> +  mkdir -p pixman/pixman
> +  pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman"
> +  pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1"

I'd prefer \$(BUILD_DIR) instead of $(pwd) for cflags and libs
because it allows moving the build directory.

\$(SRC_PATH) could be used instead of $(source_path).
This would also avoid hardcoded paths in the generated
Makefile code and match better to other include parameters.

>   fi
>   QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"
>   libs_softmmu="$libs_softmmu $pixman_libs"
> @@ -4154,7 +4155,6 @@ DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS qapi-generated"
>   DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
> -DIRS="$DIRS pixman"
>   FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
>   FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
>   FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"

Re: [Qemu-devel] [PULL 0/6] pixman build fixes

[Stefan Weil]

Am 13.11.2012 18:31, schrieb Peter Maydell:
> On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> This patch series fixes the build issues with the internal pixman
>> submodule.  It also adds licensing info to the qemu-pixman.[ch] files.
> These look OK (and I've tested that we can crosscompile using
> internal pixman in a separate builddirectory).
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> One remaining problem it would be nice to fix (probably as a
> separate patch given this lot is at the pullreq stage):
>   "make distclean" in qemu doesn't do a distclean in the pixman/
> directory.
>
> -- PMM

I just sent reviews for patches 1 and 2.

IMHO patch 2 needs some small corrections, and patch 1 can
optionally be improved.

With at least the corrections, you may add

Reviewed-by: Stefan Weil <sw@weilnetz.de>

The patch series clearly improves the current build code.
As Peter noted, more problems can be addressed later.

Cheers
Stefan

Re: [Qemu-devel] [PATCH 3/6] pixman: disable gtk

[Peter Maydell]

On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
> gtk isn only needed to build test cases.

Since we're going to get a v2 of this patch set, you could
correct the typo here: s/isn/is/.

> Disable it to simplify the build.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

-- PMM

Re: [Qemu-devel] [PATCH 4/6] pixman: add pass cflags, add -fPIC

[Peter Maydell]

On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Pass on CFLAGS to the pixman configure script.
> Add -fPIC to the cflags, needed to make the final link succeed.

In Subject, s/add pass/pass/.

-- PMM

Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early

[Peter Maydell]

On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Patch by Eric Johnson.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Does this need a Signed-off-by: from Eric? It's a pretty
trivial patch but I guess it would be nice...

thanks
-- PMM

> ---
>  configure |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index e7ca78b..fb5f002 100755
> --- a/configure
> +++ b/configure
> @@ -3953,9 +3953,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
> @@ -4153,6 +4150,10 @@ 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"
>  DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
> --
> 1.7.1
>
>

Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early

[Johnson, Eric]

It's OK to add.
Signed-off-by: Eric Johnson <ericj@mips.com>

I wasn't sure how to submit a patch to an unsubmitted patch.  I haven't had a chance to review the patch submission doc to see if that is covered.  It would still be useful info.  I intend to recreate and supply my local sed replacement of $(BUILD_DIR) and $(SRC_PATH) in $(QEMU_CFLAGS) patch to configure for patch 1 in this series to address Stefan's feedback.  I had done that patch locally prior to noticing Blue's and Gerd's patches on the list.  And discarded since trying Gerd's patch.  It is trivial to recreate.
 
-Eric

> -----Original Message-----
> From: Peter Maydell [mailto:peter.maydell@linaro.org]
> Sent: Tuesday, November 13, 2012 10:30 AM
> To: Gerd Hoffmann
> Cc: qemu-devel@nongnu.org; Johnson, Eric
> Subject: Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early
> 
> On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > Patch by Eric Johnson.
> >
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Does this need a Signed-off-by: from Eric? It's a pretty
> trivial patch but I guess it would be nice...
> 
> thanks
> -- PMM
> 
> > ---
> >  configure |    7 ++++---
> >  1 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/configure b/configure
> > index e7ca78b..fb5f002 100755
> > --- a/configure
> > +++ b/configure
> > @@ -3953,9 +3953,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
> > @@ -4153,6 +4150,10 @@ 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"
> >  DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
> > --
> > 1.7.1
> >
> >

Re: [Qemu-devel] [PATCH 1/6] pixman: add output dir to include path

[Gerd Hoffmann]

On 11/13/12 18:57, Stefan Weil wrote:
> Am 13.11.2012 09:42, schrieb Gerd Hoffmann:
>> Needed to make sure the (generated) pixman-version.h file is found.
>> Based on a patch from Blue Swirl.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>   configure |    6 +++---
>>   1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 7290f50..18faded 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2121,8 +2121,9 @@ else
>>       echo "      git submodule update --init pixman"
>>       exit 1
>>     fi
>> -  pixman_cflags="-I${source_path}/pixman/pixman"
>> -  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"
>> +  mkdir -p pixman/pixman
>> +  pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman"
>> +  pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1"
> 
> I'd prefer \$(BUILD_DIR) instead of $(pwd) for cflags and libs
> because it allows moving the build directory.

It isn't that simple.  Blue Swirl had it that way initially.  The
problem is that pixman_cflags is added to QEMU_CFLAGS, which in turn is
used by configure script checks too, which then blow up because make and
shell interpret "$(BUILD_DIR)" in different ways ...

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 2/6] pixman: pass tools to configure

[Gerd Hoffmann]

  Hi,

> An alternate solution (which works in my build environment) is passing
> --host=... (value derived from QEMU cross_prefix) to the pixman configure.

Sounds reasonable, I'll try.

>> +nm="${AR-${cross_prefix}nm}"
> 
> NM instead of AR?
> 
> RANLIB instead of LD?

Indeed.  /me wonders why the test builds worked nevertheless.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 1/6] pixman: add output dir to include path

[Gerd Hoffmann]

On 11/14/12 09:40, Gerd Hoffmann wrote:
>>> >> +  pixman_cflags="-I${source_path}/pixman/pixman -I$(pwd)/pixman/pixman"
>>> >> +  pixman_libs="-L$(pwd)/pixman/pixman/.libs -lpixman-1"

>> > 
>> > I'd prefer \$(BUILD_DIR) instead of $(pwd) for cflags and libs
>> > because it allows moving the build directory.

> It isn't that simple.  Blue Swirl had it that way initially.  The
> problem is that pixman_cflags is added to QEMU_CFLAGS, which in turn is
> used by configure script checks too, which then blow up because make and
> shell interpret "$(BUILD_DIR)" in different ways ...

Moving the lines which update QEMU_CFLAGS down the road, after all
configure checks works though.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early

[Gerd Hoffmann]

On 11/13/12 19:41, Johnson, Eric wrote:
> It's OK to add.
> Signed-off-by: Eric Johnson <ericj@mips.com>

Updated patch.

> I wasn't sure how to submit a patch to an unsubmitted patch.

As usual: "git commit -s" + "git format-patch" + "git send-email",
especially as this one stands on its own and has no dependency on the
unsubmitted patch, but it is fine for incremental fixes too.

Then I can simply "git am -s" the patch and either carry it on as is or
squash in the incremental fix on a case-by-case basis.  I tend to carry
patches as is, but in some cases squashing can be better for bisectability.

cheers,
  Gerd

Re: [Qemu-devel] [PULL 0/6] pixman build fixes

[Anthony Liguori]

Gerd Hoffmann <kraxel@redhat.com> writes:

>   Hi,
>
> This patch series fixes the build issues with the internal pixman
> submodule.  It also adds licensing info to the qemu-pixman.[ch] files.
>
> please pull,
>   Gerd
>
> The following changes since commit f5022a135e4309a54d433c69b2a056756b2d0d6b:
>
>   aio: fix aio_ctx_prepare with idle bottom halves (2012-11-12 20:02:09 +0400)
>
> are available in the git repository at:
>   git://git.kraxel.org/qemu pixman.v4

Pulled. Thanks.

Regards,

Anthony Liguori

>
> Gerd Hoffmann (6):
>       pixman: add output dir to include path
>       pixman: pass tools to configure
>       pixman: disable gtk
>       pixman: add pass cflags, add -fPIC
>       pixman: build internal version early
>       pixman: add licensing info
>
>  Makefile      |    2 +-
>  configure     |   17 +++++++++++------
>  qemu-pixman.c |    5 +++++
>  qemu-pixman.h |    5 +++++
>  4 files changed, 22 insertions(+), 7 deletions(-)

Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early

[Johnson, Eric]

> -----Original Message-----
> From: Gerd Hoffmann [mailto:kraxel@redhat.com]
> Sent: Wednesday, November 14, 2012 4:42 AM
[...]
> On 11/13/12 19:41, Johnson, Eric wrote:
[...]
> > I wasn't sure how to submit a patch to an unsubmitted patch.
> 
> As usual: "git commit -s" + "git format-patch" + "git send-email",
> especially as this one stands on its own and has no dependency on the
> unsubmitted patch, but it is fine for incremental fixes too.

Thanks.

I found portability issues with my simple sed replacement that I could not resolve to my satisfaction.  The patch you made to deal with \$(BUILD_DIR) and \$(SRC_PATH) is cleaner and simpler anyway.

-Eric