[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] configure: Require pixman for vhost-user-gpu.
From: |
Thomas Huth |
Subject: |
Re: [PATCH] configure: Require pixman for vhost-user-gpu. |
Date: |
Tue, 25 Aug 2020 17:32:33 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 |
On 22/08/2020 22.29, Philippe Mathieu-Daudé wrote:
> Hi Rafael,
>
> On 8/14/20 9:46 AM, Philippe Mathieu-Daudé wrote:
>> On 8/3/20 8:09 AM, Thomas Huth wrote:
>>> On 02/08/2020 00.44, Rafael Kitover wrote:
>>>> Use the test from Makefile to check if vhost-user-gpu is being built,
>>>> and if so require pixman.
>>>
>>> Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman")
>>>
>>> ... sorry, I missed that there is indeed a tool that requires pixman.
>>>
>>>> Signed-off-by: Rafael Kitover <rkitover@gmail.com>
>>>> ---
>>>> configure | 28 ++++++++++++++--------------
>>>> 1 file changed, 14 insertions(+), 14 deletions(-)
>>>>
>>>> diff --git a/configure b/configure
>>>> index 2acc4d1465..181b465861 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -4062,20 +4062,6 @@ if test "$modules" = yes; then
>>>> fi
>>>> fi
>>>>
>>>> -##########################################
>>>> -# pixman support probe
>>>> -
>>>> -if test "$softmmu" = "no"; then
>>>> - pixman_cflags=
>>>> - pixman_libs=
>>>> -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
>>>> - pixman_cflags=$($pkg_config --cflags pixman-1)
>>>> - pixman_libs=$($pkg_config --libs pixman-1)
>>>> -else
>>>> - error_exit "pixman >= 0.21.8 not present." \
>>>> - "Please install the pixman devel package."
>>>> -fi
>>>> -
>>>> ##########################################
>>>> # libmpathpersist probe
>>>>
>>>> @@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" =
>>>> "yes"; then
>>>> done
>>>> fi
>>>>
>>>> +##########################################
>>>> +# pixman support probe
>>>> +
>>>> +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm}
>>>> ${want_tools}" = "yes yes yes yes" ); then
>>>
>>> Do you need the round brackets here?
>>>
>>>> + pixman_cflags=
>>>> + pixman_libs=
>>>> +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
>>>> + pixman_cflags=$($pkg_config --cflags pixman-1)
>>>> + pixman_libs=$($pkg_config --libs pixman-1)
>>>> +else
>>>> + error_exit "pixman >= 0.21.8 not present." \
>>>> + "Please install the pixman devel package."
>>>> +fi
>>>> +
>>>> ##########################################
>>>> # libxml2 probe
>>>> if test "$libxml2" != "no" ; then
>>>>
>>>
>>> With the round brackets removed:
>>>
>>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>>
>> Hmm this doesn't work for me:
[...]
> Any updates?
I think the problem is that ${virglrenderer} might only be set later in
the configure script...
But since other tools might later depend on pixman, too, it's likely
cleaner to introduce a CONFIG_PIXMAN switch and skip
building of the corresponding tools in that case. I'll try to come up
with a patch...
Thomas