[Qemu-devel] [PULL 0/1] configure: Prepend pixman and ftd flags to overrule system-provided ones

[Qemu-devel] [PULL 0/1] configure: Prepend pixman and ftd flags to overrule system-provided ones

[Gerd Hoffmann]

  Hi,

Build fix for systems with old pixman (old enouth that configure ignores
it and uses the submodule instead).

please pull,
  Gerd

The following changes since commit b1d28ec6a7dbdaadda39d29322f0de694aeb0b74:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging (2014-10-10 14:55:29 +0100)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-console-20141015-1

for you to fetch changes up to 50e12060696711eca1b09b82b9215ccdeaadfd09:

  configure: Prepend pixman and ftd flags to overrule system-provided ones (2014-10-15 12:20:27 +0200)

----------------------------------------------------------------
configure: Prepend pixman and ftd flags to overrule system-provided ones

----------------------------------------------------------------
Jan Kiszka (1):
      configure: Prepend pixman and ftd flags to overrule system-provided ones

 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/1] configure: Prepend pixman and ftd flags to overrule system-provided ones

[Gerd Hoffmann]

From: Jan Kiszka <jan.kiszka@siemens.com>

Other packages may provide includes for pixman as well if the host has a
devel package installed. So add ours to the front to unsure that the
right version is used.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 9ac2600..a9e4d49 100755
--- a/configure
+++ b/configure
@@ -4211,9 +4211,9 @@ EOF
   fi
 fi
 
-# add pixman flags after all config tests are done
-QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
-libs_softmmu="$libs_softmmu $pixman_libs"
+# prepend pixman and ftd flags after all config tests are done
+QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS"
+libs_softmmu="$pixman_libs $libs_softmmu"
 
 echo "Install prefix    $prefix"
 echo "BIOS directory    `eval echo $qemu_datadir`"
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/1] configure: Prepend pixman and ftd flags to overrule system-provided ones

[Peter Maydell]

On 15 October 2014 11:28, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Build fix for systems with old pixman (old enouth that configure ignores
> it and uses the submodule instead).
>
> please pull,
>   Gerd
>
> The following changes since commit b1d28ec6a7dbdaadda39d29322f0de694aeb0b74:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging (2014-10-10 14:55:29 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-console-20141015-1
>
> for you to fetch changes up to 50e12060696711eca1b09b82b9215ccdeaadfd09:
>
>   configure: Prepend pixman and ftd flags to overrule system-provided ones (2014-10-15 12:20:27 +0200)

Applied, thanks.

-- PMM