| Message ID | 1421355978-14208-3-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
Hi Ian, On 16/01/15 10:05, Ian Campbell wrote: > On Thu, 2015-01-15 at 21:06 +0000, Julien Grall wrote: >> QEMU upstream requires the use of pixman. When pixman is not present the >> system, the configure of QEMU will fail with: >> >> ERROR: pixman 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: >> git submodule update --init pixman >> >> I think we can use by default the version on the system. So check it >> a Xen configuration time to avoid a build issue later. >> >> Signed-off-by: Julien Grall <julien.grall@linaro.org> >> >> --- >> This patch requires to regenerate tools/configure. >> >> Changes in v2: >> - Only check if pixman is present when building QEMU >> --- >> tools/configure.ac | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/tools/configure.ac b/tools/configure.ac >> index 2aff18d..64dc75c 100644 >> --- a/tools/configure.ac >> +++ b/tools/configure.ac >> @@ -323,9 +323,10 @@ esac >> AX_CHECK_UUID >> AX_CHECK_CURSES >> >> -dnl Glib 2.0 is only required when QEMU is built >> +dnl Glib 2.0 and pixman are only required when QEMU is built > > Rather than an ever increasing list here I propose to say "The following > are only...", and perhaps insert an "upstream" before QEMU, unless these > are needed for trad too (in which case the condition isn't quite right). > I think glib and pixman are only for upstream though. Right. > I can do that on commit though if you like. Yes please. Regards,
diff --git a/tools/configure.ac b/tools/configure.ac index 2aff18d..64dc75c 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -323,9 +323,10 @@ esac AX_CHECK_UUID AX_CHECK_CURSES -dnl Glib 2.0 is only required when QEMU is built +dnl Glib 2.0 and pixman are only required when 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) ]) AX_CHECK_FETCHER
QEMU upstream requires the use of pixman. When pixman is not present the system, the configure of QEMU will fail with: ERROR: pixman 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: git submodule update --init pixman I think we can use by default the version on the system. So check it a Xen configuration time to avoid a build issue later. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- This patch requires to regenerate tools/configure. Changes in v2: - Only check if pixman is present when building QEMU --- tools/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)