| Message ID | 542CFB46.80209@siemens.com |
|---|---|
| State | New |
| Headers | show |
On Do, 2014-10-02 at 09:14 +0200, Jan Kiszka wrote: > Other packages may provide includes for pixman as well if the host has a > devel package installed. Remove them from QEMU_CFLAGS before adding our > version to unsure that the right headers are used. Hmm, how does that happen? Shouldn't qemu use the system pixman if present? Well, maybe not in case it is too old ... I think we should just reverse the ordering, so our pixman submodule comes first in the include path list. And it is probably a good idea to do the same for fdt. cheers, Gerd
diff --git a/configure b/configure index 9ac2600..98c7cc8 100755 --- a/configure +++ b/configure @@ -4211,8 +4211,9 @@ EOF fi fi -# add pixman flags after all config tests are done -QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags" +# add pixman flags after all config tests are done, +# filtering out conflicting includes paths +QEMU_CFLAGS=`echo "$QEMU_CFLAGS" | sed "s/-I[^ ]*pixman-1//"`" $pixman_cflags $fdt_cflags" libs_softmmu="$libs_softmmu $pixman_libs" echo "Install prefix $prefix"
Other packages may provide includes for pixman as well if the host has a devel package installed. Remove them from QEMU_CFLAGS before adding our version to unsure that the right headers are used. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)