From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Stefan Weil <sw@weilnetz.de>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
QEMU <qemu-devel@nongnu.org>
Subject: Re: [PATCH for-5.2] nsis: Fix build for 64 bit installer
Date: Thu, 26 Nov 2020 01:24:03 +0400 [thread overview]
Message-ID: <CAJ+F1CL_ByOhpHaVpiQdp+yHNO8gwtK5a2c0DOucV_xG-WW=mQ@mail.gmail.com> (raw)
In-Reply-To: <20201125191833.964753-1-sw@weilnetz.de>
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
On Wed, Nov 25, 2020 at 11:22 PM Stefan Weil <sw@weilnetz.de> wrote:
> Pass cpu instead of cpu_family to the NSIS installer script.
>
> That script checks for "x86_64" which is the cpu value,
> while cpu_family is "x86".
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 5062407c70..8a99c948d3 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1956,7 +1956,7 @@ if host_machine.system() == 'windows'
> '@OUTPUT@',
> get_option('prefix'),
> meson.current_source_dir(),
> - host_machine.cpu_family(),
> + host_machine.cpu(),
> '--',
> '-DDISPLAYVERSION=' + meson.project_version(),
> ]
> --
> 2.29.2
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 1681 bytes --]
prev parent reply other threads:[~2020-11-25 21:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 19:18 [PATCH for-5.2] nsis: Fix build for 64 bit installer Stefan Weil
2020-11-25 19:28 ` Peter Maydell
2020-11-25 20:59 ` Stefan Weil
2020-11-26 9:29 ` Daniel P. Berrangé
2020-11-25 21:26 ` Marc-André Lureau
2020-11-25 21:24 ` Marc-André Lureau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ+F1CL_ByOhpHaVpiQdp+yHNO8gwtK5a2c0DOucV_xG-WW=mQ@mail.gmail.com' \
--to=marcandre.lureau@gmail.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).