From: Jan Kiszka <jan.kiszka@siemens.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH] configure: Filter out system includes for pixman
Date: Thu, 02 Oct 2014 09:14:14 +0200 [thread overview]
Message-ID: <542CFB46.80209@siemens.com> (raw)
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(-)
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
next reply other threads:[~2014-10-02 7:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 7:14 Jan Kiszka [this message]
2014-10-02 7:43 ` [Qemu-devel] [PATCH] configure: Filter out system includes for pixman Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=542CFB46.80209@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).