diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-03-11 17:09:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-16 23:02:22 +0100 |
| commit | 5b42bc5ce9ab4a3171819feea5042931817211fd (patch) | |
| tree | 3e6b0c1d1ebd1f04615a055779d9c4b362419f05 /contrib | |
| parent | 78b3f67acdf0f646d35ebdf98b9e91fb04ab9a07 (diff) | |
| download | qemu-5b42bc5ce9ab4a3171819feea5042931817211fd.zip qemu-5b42bc5ce9ab4a3171819feea5042931817211fd.tar.gz qemu-5b42bc5ce9ab4a3171819feea5042931817211fd.tar.bz2 | |
build-sys: do not make qemu-ga link with pixman
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 <marcandre.lureau@redhat.com>
Message-Id: <20200311160923.882474-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/vhost-user-gpu/Makefile.objs | 6 | ||||
| -rw-r--r-- | contrib/vhost-user-gpu/vhost-user-gpu.c (renamed from contrib/vhost-user-gpu/main.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/vhost-user-gpu/Makefile.objs b/contrib/vhost-user-gpu/Makefile.objs index 6170c91..0929609 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) diff --git a/contrib/vhost-user-gpu/main.c b/contrib/vhost-user-gpu/vhost-user-gpu.c index b45d201..b45d201 100644 --- a/contrib/vhost-user-gpu/main.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c |