Skip to contentSkip to conversation

configure: Filter out system includes for pixman

PATCH In review Jan Kiszka 2 participants 2 messages Oct 2, 2014

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 configure: Filter out system includes for pixman

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.

---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
configure +3 -2
index 9ac2600..98c7cc8 100755
@@ -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"
Signature · 1 line
1.8.1.1.298.ge7eed54
#1 lore raw
Quoted 3 lines · Jan Kiszka

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