[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] abc14f: meson: fix logic for gnutls check
From: |
Peter Maydell |
Subject: |
[Qemu-commits] [qemu/qemu] abc14f: meson: fix logic for gnutls check |
Date: |
Mon, 09 Aug 2021 07:00:29 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: abc14fd05606274d8350f1f90d1ec7bc9e51aa21
https://github.com/qemu/qemu/commit/abc14fd05606274d8350f1f90d1ec7bc9e51aa21
Author: Alyssa Ross <hi@alyssa.is>
Date: 2021-08-06 (Fri, 06 Aug 2021)
Changed paths:
M meson.build
Log Message:
-----------
meson: fix logic for gnutls check
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>
Commit: 632eda54043d6f26ff87dac16233e14b4708b967
https://github.com/qemu/qemu/commit/632eda54043d6f26ff87dac16233e14b4708b967
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-08-09 (Mon, 09 Aug 2021)
Changed paths:
M meson.build
Log Message:
-----------
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into
staging
Fix for gnutls-crypto detection
# gpg: Signature made Mon 09 Aug 2021 10:43:32 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
meson: fix logic for gnutls check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/dee64246ded3...632eda54043d