mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools: require at least pixman 0.21.8 for qemu-xen
Avoid late build failure in openSUSE 11.4, it has just pixman-0.20: .... [ 211s] ERROR: pixman >= 0.21.8 not present. Your options: [ 211s] (1) Preferred: Install the pixman devel package (any recent [ 211s] distro should have packages as Xorg needs pixman too). [ 211s] (2) Fetch the pixman submodule, using: [ 211s] git submodule update --init pixman .... Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
2b4778b3f3
commit
85bae367e7
2 files changed
+10
-10
No files matched your search
Vendored
+9
-9
@@ -7724,12 +7724,12 @@ if test -n "$pixman_CFLAGS"; then
|
||||
pkg_cv_pixman_CFLAGS="$pixman_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null`
|
||||
pkg_cv_pixman_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.21.8" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -7741,12 +7741,12 @@ if test -n "$pixman_LIBS"; then
|
||||
pkg_cv_pixman_LIBS="$pixman_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1 >= 0.21.8\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "pixman-1 >= 0.21.8") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null`
|
||||
pkg_cv_pixman_LIBS=`$PKG_CONFIG --libs "pixman-1 >= 0.21.8" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -7767,14 +7767,14 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1`
|
||||
pixman_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1`
|
||||
else
|
||||
pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1`
|
||||
pixman_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1 >= 0.21.8" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$pixman_PKG_ERRORS" >&5
|
||||
|
||||
as_fn_error $? "Package requirements (pixman-1) were not met:
|
||||
as_fn_error $? "Package requirements (pixman-1 >= 0.21.8) were not met:
|
||||
|
||||
$pixman_PKG_ERRORS
|
||||
|
||||
|
||||
+1
-1
@@ -320,7 +320,7 @@ esac
|
||||
dnl The following are only required when upstream QEMU is built
|
||||
AS_IF([test "x$qemu_xen" = "xy"], [
|
||||
PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12])
|
||||
PKG_CHECK_MODULES(pixman, pixman-1)
|
||||
PKG_CHECK_MODULES(pixman, [pixman-1 >= 0.21.8])
|
||||
])
|
||||
AX_CHECK_FETCHER
|
||||
|
||||
|
||||