QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] configure: Require pixman for vhost-user-gpu.
@ 2020-08-01 22:44 Rafael Kitover
  2020-08-03  6:09 ` Thomas Huth
  0 siblings, 1 reply; 2+ messages in thread
From: Rafael Kitover @ 2020-08-01 22:44 UTC (permalink / raw)
  To: qemu-devel; +Cc: Rafael Kitover

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



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] configure: Require pixman for vhost-user-gpu.
  2020-08-01 22:44 [PATCH] configure: Require pixman for vhost-user-gpu Rafael Kitover
@ 2020-08-03  6:09 ` Thomas Huth
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Huth @ 2020-08-03  6:09 UTC (permalink / raw)
  To: Rafael Kitover, qemu-devel; +Cc: Gerd Hoffmann

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>



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-01 22:44 [PATCH] configure: Require pixman for vhost-user-gpu Rafael Kitover
2020-08-03  6:09 ` Thomas Huth

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git