* [PULL 0/1] Build system patch for 6.1-rc3
@ 2021-08-09 9:45 Paolo Bonzini
2021-08-09 9:45 ` [PULL 1/1] meson: fix logic for gnutls check Paolo Bonzini
2021-08-09 13:59 ` [PULL 0/1] Build system patch for 6.1-rc3 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-08-09 9:45 UTC (permalink / raw)
To: qemu-devel
The following changes since commit dee64246ded3aa7dbada68b96ce1c64e5bea327d:
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-08-06 10:28:33 +0100)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to abc14fd05606274d8350f1f90d1ec7bc9e51aa21:
meson: fix logic for gnutls check (2021-08-06 15:36:11 +0000)
----------------------------------------------------------------
Fix for gnutls-crypto detection
----------------------------------------------------------------
Alyssa Ross (1):
meson: fix logic for gnutls check
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] meson: fix logic for gnutls check
2021-08-09 9:45 [PULL 0/1] Build system patch for 6.1-rc3 Paolo Bonzini
@ 2021-08-09 9:45 ` Paolo Bonzini
2021-08-09 13:59 ` [PULL 0/1] Build system patch for 6.1-rc3 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-08-09 9:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Alyssa Ross
From: Alyssa Ross <hi@alyssa.is>
The logic before was
if not get_option('gnutls').auto() or have_system
Which is equivalent to
if get_option('gnutls').enabled() or get_option('gnutls').disabled() or have_system
This means that the check for gnutls is performed even if gnutls is
disabled, which means that the build system will insist on having
libtasn1 if gnutls is found, even if gnutls support is disabled.
When gnutls is disabled, the check for gnutls shouldn't be performed,
to ensure that further build system logic (like the check for
libtasn1) doesn't make decisions based on the presence of gnutls,
rather than the gnutls option.
After making this change, I can successfully ./configure --disable-gnutls
on my system with gnutls installed, but not libtasn1.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Message-Id: <20210806144947.321647-1-hi@alyssa.is>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index af9bbb83db..b3e7ec0e92 100644
--- a/meson.build
+++ b/meson.build
@@ -824,7 +824,7 @@ endif
gnutls = not_found
gnutls_crypto = not_found
-if not get_option('gnutls').auto() or have_system
+if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_system)
# For general TLS support our min gnutls matches
# that implied by our platform support matrix
#
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] Build system patch for 6.1-rc3
2021-08-09 9:45 [PULL 0/1] Build system patch for 6.1-rc3 Paolo Bonzini
2021-08-09 9:45 ` [PULL 1/1] meson: fix logic for gnutls check Paolo Bonzini
@ 2021-08-09 13:59 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2021-08-09 13:59 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Mon, 9 Aug 2021 at 10:48, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit dee64246ded3aa7dbada68b96ce1c64e5bea327d:
>
> Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-08-06 10:28:33 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to abc14fd05606274d8350f1f90d1ec7bc9e51aa21:
>
> meson: fix logic for gnutls check (2021-08-06 15:36:11 +0000)
>
> ----------------------------------------------------------------
> Fix for gnutls-crypto detection
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-09 14:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-09 9:45 [PULL 0/1] Build system patch for 6.1-rc3 Paolo Bonzini
2021-08-09 9:45 ` [PULL 1/1] meson: fix logic for gnutls check Paolo Bonzini
2021-08-09 13:59 ` [PULL 0/1] Build system patch for 6.1-rc3 Peter Maydell
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).