[PATCH v2 0/2] tools/configure: Add QEMU dependencies

[PATCH v2 0/2] tools/configure: Add QEMU dependencies

[Julien Grall]

Hello,

This small patch series replaces the patch [1] sent earlier.

Sincerely yours,

[1] https://patches.linaro.org/43077/

Julien Grall (2):
  tools/configure: Check if Glib is present only when building QEMU
  tools/configure: Check if pixman is present on the system when
    building QEMU

 tools/configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

-- 
2.1.4

[PATCH v2 1/2] tools/configure: Check if Glib is present only when building QEMU

[Julien Grall]

Signed-off-by: Julien Grall <julien.grall@linaro.org>

---
    This patch requires to regenerate tools/configure

    Changes in v2:
        - Patch added
---
 tools/configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/configure.ac b/tools/configure.ac
index 72e2465..2aff18d 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -322,7 +322,11 @@ i[[3456]]86|x86_64)
 esac
  AX_CHECK_UUID
  AX_CHECK_CURSES
+
+dnl Glib 2.0 is only required when QEMU is built
+AS_IF([test "x$qemu_xen" = "xy"], [
 PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12])
+])
 AX_CHECK_FETCHER
 
 # Checks for libraries.
-- 
2.1.4

[PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU

[Julien Grall]

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
 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
 
-- 
2.1.4

Re: [PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU

[Ian Campbell]

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.

I can do that on commit though if you like.

>  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
>  

[PATCH v2 0/2] tools/configure: Add QEMU dependencies

[Ian Jackson]

Julien Grall writes ("[PATCH v2 0/2] tools/configure: Add QEMU dependencies"):
> This small patch series replaces the patch [1] sent earlier.

Both:

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks,
Ian.

Re: [PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU"):
> On Thu, 2015-01-15 at 21:06 +0000, Julien Grall wrote:
> > -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.
> 
> I can do that on commit though if you like.

Either way is fine by me.

Ian.

Re: [PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU

[Julien Grall]

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,


-- 
Julien Grall

Re: [PATCH v2 2/2] tools/configure: Check if pixman is present on the system when building QEMU

[Ian Campbell]

On Fri, 2015-01-16 at 12:02 +0000, Julien Grall wrote:
> 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.

Applied and done, with Ian and my acks.

I also reran autogen.sh after each patch.

I happened to notice in the diff against configure:
        +Alternatively, you may set the environment variables pixman_CFLAGS
        +and pixman_LIBS to avoid the need to call pkg-config.
        +See the pkg-config man page for more details." "$LINENO" 5

I'm imagining this is true even though we don't use pixman ourselves,
since we don't censor the envvars we pass to qemu's real configure.
Assuming qemu uses pkg-config I suppose.

I don't propose we need to do anything except keep this in mind if
people start saying they were told to uxe pixman_CFLAGS and it didn't do
what they has been told it would.

Ian.