[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] ui: add x_keymap.o to modules
From: |
Daniel P . Berrangé |
Subject: |
Re: [Qemu-devel] [PATCH] ui: add x_keymap.o to modules |
Date: |
Thu, 17 May 2018 13:44:03 +0100 |
User-agent: |
Mutt/1.9.5 (2018-04-13) |
On Thu, May 17, 2018 at 02:39:42PM +0200, Paolo Bonzini wrote:
> x_keymap.o is common to the SDL and GTK+ modules, and it causes the
> QEMU binary to link to the X11 libraries. Add it separately to the
> modules to keep the main QEMU binary smaller.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> ui/Makefile.objs | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/ui/Makefile.objs b/ui/Makefile.objs
> index cc78434..00f6976 100644
> --- a/ui/Makefile.objs
> +++ b/ui/Makefile.objs
> @@ -15,10 +15,6 @@ common-obj-$(CONFIG_COCOA) += cocoa.o
> common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
> common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o
>
> -common-obj-$(CONFIG_X11) += x_keymap.o
> -x_keymap.o-cflags := $(X11_CFLAGS)
> -x_keymap.o-libs := $(X11_LIBS)
> -
> # ui-sdl module
> common-obj-$(CONFIG_SDL) += sdl.mo
> ifeq ($(CONFIG_SDLABI),1.2)
> @@ -46,6 +42,13 @@ gtk.mo-objs += gtk-gl-area.o
> endif
> endif
>
> +ifeq ($(CONFIG_X11),y)
> +sdl.mo-objs += x_keymap.o
> +gtk.mo-objs += x_keymap.o
Would this cause symbol clash if both sdl & gtk modules are loaded
at the same time, or have we used linker scripts to limit what symbols
each module exposes ?
> +x_keymap.o-cflags := $(X11_CFLAGS)
> +x_keymap.o-libs := $(X11_LIBS)
> +endif
> +
> common-obj-$(CONFIG_CURSES) += curses.mo
> curses.mo-objs := curses.o
> curses.mo-cflags := $(CURSES_CFLAGS)
> --
> 1.8.3.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [Qemu-devel] [PATCH] ui: add x_keymap.o to modules, Gerd Hoffmann, 2018/05/18