diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 16:42:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 16:42:28 +0100 |
| commit | 16ab5046c4a607dddabc8086d4454293af59fc9f (patch) | |
| tree | 259ad0bd7fb8bf2e881e38f67b9f23555b7cce0e | |
| parent | 2b31cd4e081389ec1688f58af27f9759bf221c1d (diff) | |
| parent | 236f282c1c7bb41b0ec3b3d771ca652eb85ed81f (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140915-1' into staging
Fix pixman build failure.
# gpg: Signature made Mon 15 Sep 2014 07:15:11 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-console-20140915-1:
configure: check for pixman-1 version
pixman: update internal copy to pixman-0.32.6
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 5 | ||||
| m--------- | pixman | 0 |
2 files changed, 3 insertions, 2 deletions
@@ -2737,7 +2737,7 @@ fi if test "$pixman" = ""; then if test "$want_tools" = "no" -a "$softmmu" = "no"; then pixman="none" - elif $pkg_config pixman-1 > /dev/null 2>&1; then + elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then pixman="system" else pixman="internal" @@ -2753,11 +2753,12 @@ if test "$pixman" = "none"; then pixman_cflags= pixman_libs= elif test "$pixman" = "system"; then + # pixman version has been checked above pixman_cflags=`$pkg_config --cflags pixman-1` pixman_libs=`$pkg_config --libs pixman-1` else if test ! -d ${source_path}/pixman/pixman; then - error_exit "pixman not present. Your options:" \ + error_exit "pixman >= 0.21.8 not present. Your options:" \ " (1) Preferred: Install the pixman devel package (any recent" \ " distro should have packages as Xorg needs pixman too)." \ " (2) Fetch the pixman submodule, using:" \ diff --git a/pixman b/pixman -Subproject 97336fad32acf802003855cd8bd6477fa49a12e +Subproject 87eea99e443b389c978cf37efc52788bf03a0ee |