[PATCH] configure: Require pixman for vhost-user-gpu.

Rafael Kitover posted 1 patch 1 week ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200801224406.315875-1-rkitover@gmail.com
configure | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

[PATCH] configure: Require pixman for vhost-user-gpu.

Posted by Rafael Kitover 1 week ago
Use the test from Makefile to check if vhost-user-gpu is being built,
and if so require 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
+  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
-- 
2.28.0


Re: [PATCH] configure: Require pixman for vhost-user-gpu.

Posted by Thomas Huth 1 week ago
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>