From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZaal-0003dI-IO for qemu-devel@nongnu.org; Thu, 02 Oct 2014 03:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZaaf-0007ni-KR for qemu-devel@nongnu.org; Thu, 02 Oct 2014 03:14:23 -0400 Received: from david.siemens.de ([192.35.17.14]:40550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZaaf-0007nD-AG for qemu-devel@nongnu.org; Thu, 02 Oct 2014 03:14:17 -0400 Message-ID: <542CFB46.80209@siemens.com> Date: Thu, 02 Oct 2014 09:14:14 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] configure: Filter out system includes for pixman List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel 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 --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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" -- 1.8.1.1.298.ge7eed54