mbox series

[v2,0/2] meson: avoid compiling qemu-keymap by default

Message ID 20200824152430.1844159-1-laurent@vivier.eu (mailing list archive)
Headers show
Series meson: avoid compiling qemu-keymap by default | expand

Message

Laurent Vivier Aug. 24, 2020, 3:24 p.m. UTC 
We don't need it with linux-user only build, and if xkbcommon dynamic
library is detected it can break the build of static only binaries.

So disable it if it is no explicitly asked by the user when neither
system or tools are built.

build qemu-keymap:
  configure --disable-system --disable-tools --disable-user --enable-xkbcommon
  configure --disable-system --enable-tools --disable-user
  configure --enable-system --disable-tools --disable-user

don't build qemu-keymap:
  configure --disable-system --disable-tools --disable-user
  configure --disable-system --disable-tools --enable-user

Laurent Vivier (2):
  meson: move xkbcommon to meson
  meson: avoid compiling qemu-keymap by default

 configure         | 29 ++++-------------------------
 meson.build       | 16 +++++++++++-----
 meson_options.txt |  1 +
 ui/meson.build    |  2 +-
 4 files changed, 17 insertions(+), 31 deletions(-)

Comments

Paolo Bonzini Aug. 25, 2020, 7:52 a.m. UTC | #1 
Queued, thanks.

Paolo

Il lun 24 ago 2020, 17:24 Laurent Vivier <laurent@vivier.eu> ha scritto:

> We don't need it with linux-user only build, and if xkbcommon dynamic
> library is detected it can break the build of static only binaries.
>
> So disable it if it is no explicitly asked by the user when neither
> system or tools are built.
>
> build qemu-keymap:
>   configure --disable-system --disable-tools --disable-user
> --enable-xkbcommon
>   configure --disable-system --enable-tools --disable-user
>   configure --enable-system --disable-tools --disable-user
>
> don't build qemu-keymap:
>   configure --disable-system --disable-tools --disable-user
>   configure --disable-system --disable-tools --enable-user
>
> Laurent Vivier (2):
>   meson: move xkbcommon to meson
>   meson: avoid compiling qemu-keymap by default
>
>  configure         | 29 ++++-------------------------
>  meson.build       | 16 +++++++++++-----
>  meson_options.txt |  1 +
>  ui/meson.build    |  2 +-
>  4 files changed, 17 insertions(+), 31 deletions(-)
>
> --
> 2.26.2
>
>
>