Re: [PATCH] build-sys: do not make qemu-ga link with pixman

[Paolo Bonzini]

On 11/03/20 17:09, Marc-André Lureau wrote:
> Since commit d52c454aadcdae74506f315ebf8b58bb79a05573 ("contrib: add
> vhost-user-gpu"), qemu-ga is linking with pixman.
> 
> This is because the Make-based build-system use a global namespace for
> variables, and we rely on "main.o-libs" for different linking targets.
> 
> Note: this kind of variable clashing is hard to fix or prevent
> currently.  meson should help, as declarations have a linear
> dependency and doesn't rely so much on variables and clever tricks.
> 
> Note2: we have a lot of main.c (or other duplicated names!) in
> tree. Imho, it would be annoying and a bad workaroud to rename all
> those to avoid conflicts like I did here.
> 
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1811670
> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  contrib/vhost-user-gpu/{main.c => vhost-user-gpu.c} | 0
>  contrib/vhost-user-gpu/Makefile.objs                | 6 +++---
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename contrib/vhost-user-gpu/{main.c => vhost-user-gpu.c} (100%)
> 
> diff --git a/contrib/vhost-user-gpu/main.c 
> b/contrib/vhost-user-gpu/vhost-user-gpu.c
> similarity index 100%
> rename from contrib/vhost-user-gpu/main.c
> rename to contrib/vhost-user-gpu/vhost-user-gpu.c
> diff --git a/contrib/vhost-user-gpu/Makefile.objs 
> b/contrib/vhost-user-gpu/Makefile.objs
> index 6170c919e4..09296091be 100644
> --- a/contrib/vhost-user-gpu/Makefile.objs
> +++ b/contrib/vhost-user-gpu/Makefile.objs
> @@ -1,7 +1,7 @@
> -vhost-user-gpu-obj-y = main.o virgl.o vugbm.o
> +vhost-user-gpu-obj-y = vhost-user-gpu.o virgl.o vugbm.o
>  
> -main.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS)
> -main.o-libs := $(PIXMAN_LIBS)
> +vhost-user-gpu.o-cflags := $(PIXMAN_CFLAGS) $(GBM_CFLAGS)
> +vhost-user-gpu.o-libs := $(PIXMAN_LIBS)
>  
>  virgl.o-cflags := $(VIRGL_CFLAGS) $(GBM_CFLAGS)
>  virgl.o-libs := $(VIRGL_LIBS)
> 

Queued, thanks.

Paolo