[PATCH 0/5] meson: mingw installation fixes & nsis conversion

marcandre.lureau@redhat.com posted 5 patches 3 years, 8 months ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200825150409.346957-1-marcandre.lureau@redhat.com
There is a newer version of this series
Makefile                           | 56 -----------------------------
configure                          |  2 ++
contrib/vhost-user-gpu/meson.build |  2 +-
docs/meson.build                   |  4 +--
meson.build                        | 32 +++++++++++++++--
meson_options.txt                  |  2 ++
pc-bios/descriptors/meson.build    |  2 +-
pc-bios/keymaps/meson.build        |  6 ++--
pc-bios/meson.build                |  2 +-
scripts/nsis.sh                    | 58 ++++++++++++++++++++++++++++++
tools/virtiofsd/meson.build        |  2 +-
trace/meson.build                  |  2 +-
12 files changed, 101 insertions(+), 69 deletions(-)
create mode 100755 scripts/nsis.sh
[PATCH 0/5] meson: mingw installation fixes & nsis conversion
Posted by marcandre.lureau@redhat.com 3 years, 8 months ago
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Hi,

The following patches fix installation path when cross-compiling Windows
version, and move the NSIS build rule to meson.

Marc-André Lureau (5):
  meson: pass confsuffix option
  meson: use meson datadir instead of qemu_datadir
  meson: add docdir option and pass pre-prefix qemu_docdir
  meson: use meson mandir instead of qemu_mandir
  meson: add NSIS building

 Makefile                           | 56 -----------------------------
 configure                          |  2 ++
 contrib/vhost-user-gpu/meson.build |  2 +-
 docs/meson.build                   |  4 +--
 meson.build                        | 32 +++++++++++++++--
 meson_options.txt                  |  2 ++
 pc-bios/descriptors/meson.build    |  2 +-
 pc-bios/keymaps/meson.build        |  6 ++--
 pc-bios/meson.build                |  2 +-
 scripts/nsis.sh                    | 58 ++++++++++++++++++++++++++++++
 tools/virtiofsd/meson.build        |  2 +-
 trace/meson.build                  |  2 +-
 12 files changed, 101 insertions(+), 69 deletions(-)
 create mode 100755 scripts/nsis.sh

-- 
2.26.2



Re: [PATCH 0/5] meson: mingw installation fixes & nsis conversion
Posted by Paolo Bonzini 3 years, 8 months ago
Whenever we fix these bugs I would rather avoid adding duplicates between
options and config-host.mak, so that we can sooner or later get rid of
config-host.mak.

For the same reason, I think all options should have a sensible default so
that in the end it will be possible to do "meson setup". Do you think it's
possible to extend the series in this direction?

Paolo

Il mar 25 ago 2020, 17:04 <marcandre.lureau@redhat.com> ha scritto:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Hi,
>
> The following patches fix installation path when cross-compiling Windows
> version, and move the NSIS build rule to meson.
>
> Marc-André Lureau (5):
>   meson: pass confsuffix option
>   meson: use meson datadir instead of qemu_datadir
>   meson: add docdir option and pass pre-prefix qemu_docdir
>   meson: use meson mandir instead of qemu_mandir
>   meson: add NSIS building
>
>  Makefile                           | 56 -----------------------------
>  configure                          |  2 ++
>  contrib/vhost-user-gpu/meson.build |  2 +-
>  docs/meson.build                   |  4 +--
>  meson.build                        | 32 +++++++++++++++--
>  meson_options.txt                  |  2 ++
>  pc-bios/descriptors/meson.build    |  2 +-
>  pc-bios/keymaps/meson.build        |  6 ++--
>  pc-bios/meson.build                |  2 +-
>  scripts/nsis.sh                    | 58 ++++++++++++++++++++++++++++++
>  tools/virtiofsd/meson.build        |  2 +-
>  trace/meson.build                  |  2 +-
>  12 files changed, 101 insertions(+), 69 deletions(-)
>  create mode 100755 scripts/nsis.sh
>
> --
> 2.26.2
>
>
>
Re: [PATCH 0/5] meson: mingw installation fixes & nsis conversion
Posted by Marc-André Lureau 3 years, 8 months ago
Hi

On Tue, Aug 25, 2020 at 8:38 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Whenever we fix these bugs I would rather avoid adding duplicates between options and config-host.mak, so that we can sooner or later get rid of config-host.mak.

This is not adding things to config-host.mak.

> For the same reason, I think all options should have a sensible default so that in the end it will be possible to do "meson setup". Do you think it's possible to extend the series in this direction?

The options I added also have default values.

I think trying to remove (or just move) variables would be a separate
goal from this series. It's already not completely trivial to get the
conversion working without regression, as you probably know :) better
not to mix goals imho.

>
> Paolo
>
> Il mar 25 ago 2020, 17:04 <marcandre.lureau@redhat.com> ha scritto:
>>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Hi,
>>
>> The following patches fix installation path when cross-compiling Windows
>> version, and move the NSIS build rule to meson.
>>
>> Marc-André Lureau (5):
>>   meson: pass confsuffix option
>>   meson: use meson datadir instead of qemu_datadir
>>   meson: add docdir option and pass pre-prefix qemu_docdir
>>   meson: use meson mandir instead of qemu_mandir
>>   meson: add NSIS building
>>
>>  Makefile                           | 56 -----------------------------
>>  configure                          |  2 ++
>>  contrib/vhost-user-gpu/meson.build |  2 +-
>>  docs/meson.build                   |  4 +--
>>  meson.build                        | 32 +++++++++++++++--
>>  meson_options.txt                  |  2 ++
>>  pc-bios/descriptors/meson.build    |  2 +-
>>  pc-bios/keymaps/meson.build        |  6 ++--
>>  pc-bios/meson.build                |  2 +-
>>  scripts/nsis.sh                    | 58 ++++++++++++++++++++++++++++++
>>  tools/virtiofsd/meson.build        |  2 +-
>>  trace/meson.build                  |  2 +-
>>  12 files changed, 101 insertions(+), 69 deletions(-)
>>  create mode 100755 scripts/nsis.sh
>>
>> --
>> 2.26.2
>>
>>


Re: [PATCH 0/5] meson: mingw installation fixes & nsis conversion
Posted by Paolo Bonzini 3 years, 8 months ago
Il mar 25 ago 2020, 18:49 Marc-André Lureau <marcandre.lureau@redhat.com>
ha scritto:

> Hi
>
> On Tue, Aug 25, 2020 at 8:38 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > Whenever we fix these bugs I would rather avoid adding duplicates
> between options and config-host.mak, so that we can sooner or later get rid
> of config-host.mak.
>

Yes I was talking more of the new options but you're right there's no
duplication. Do not review patches on a phone. :-)

Paolo


> This is not adding things to config-host.mak.
>
> > For the same reason, I think all options should have a sensible default
> so that in the end it will be possible to do "meson setup". Do you think
> it's possible to extend the series in this direction?
>
> The options I added also have default values.
>
> I think trying to remove (or just move) variables would be a separate
> goal from this series. It's already not completely trivial to get the
> conversion working without regression, as you probably know :) better
> not to mix goals imho.
>
> >
> > Paolo
> >
> > Il mar 25 ago 2020, 17:04 <marcandre.lureau@redhat.com> ha scritto:
> >>
> >> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >>
> >> Hi,
> >>
> >> The following patches fix installation path when cross-compiling Windows
> >> version, and move the NSIS build rule to meson.
> >>
> >> Marc-André Lureau (5):
> >>   meson: pass confsuffix option
> >>   meson: use meson datadir instead of qemu_datadir
> >>   meson: add docdir option and pass pre-prefix qemu_docdir
> >>   meson: use meson mandir instead of qemu_mandir
> >>   meson: add NSIS building
> >>
> >>  Makefile                           | 56 -----------------------------
> >>  configure                          |  2 ++
> >>  contrib/vhost-user-gpu/meson.build |  2 +-
> >>  docs/meson.build                   |  4 +--
> >>  meson.build                        | 32 +++++++++++++++--
> >>  meson_options.txt                  |  2 ++
> >>  pc-bios/descriptors/meson.build    |  2 +-
> >>  pc-bios/keymaps/meson.build        |  6 ++--
> >>  pc-bios/meson.build                |  2 +-
> >>  scripts/nsis.sh                    | 58 ++++++++++++++++++++++++++++++
> >>  tools/virtiofsd/meson.build        |  2 +-
> >>  trace/meson.build                  |  2 +-
> >>  12 files changed, 101 insertions(+), 69 deletions(-)
> >>  create mode 100755 scripts/nsis.sh
> >>
> >> --
> >> 2.26.2
> >>
> >>
>
>