From patchwork Fri Aug 6 14:49:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alyssa Ross X-Patchwork-Id: 1514386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=alyssa.is header.i=@alyssa.is header.a=rsa-sha256 header.s=fm3 header.b=pujyBwx+; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=akfE0acw; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gh7hB4ncXz9sT6 for ; Sat, 7 Aug 2021 00:50:50 +1000 (AEST) Received: from localhost ([::1]:48598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC1BQ-00086D-2c for incoming@patchwork.ozlabs.org; Fri, 06 Aug 2021 10:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC1B2-00084b-ES for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:50:24 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:40155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC1Az-0002hf-Rq for qemu-devel@nongnu.org; Fri, 06 Aug 2021 10:50:24 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 13288320046E; Fri, 6 Aug 2021 10:50:20 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 06 Aug 2021 10:50:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=32JuJNA26l95V9hq43OzZjt7p6 2jluxGcrx5aaLk0hw=; b=pujyBwx+K7Ig2Dl7VlT+aPsW9gd1HNgV7W0CF1ndZL Ih4iATU9S3gm6Tf+gD17zIhzJgZaetgXAVqOEj3GJZzYSqqKPU9Vc+7ROUCAGxHm Be36h+iMn3eH/OWJrc55s0k6oZQgE8T1/oWBZe9aMO6lNRN//fCYwDPxS1zI175D X0zV0xHDEHqOAlNVd6Hh+fT023mmz2FaFLJQ3B0C6WSSNGYPeW20U2hx1T3xEmQm xEUIPx83DLDtk1OpWEw2EMh57/4eX+X2rSsRYaaRHB+4pYy5Lu8su/MQDBSJgELG LIPiMCn6yjxqfSr7HLxVjL1ud5RichV8OMD3zg7O2fcQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=32JuJNA26l95V9hq4 3OzZjt7p62jluxGcrx5aaLk0hw=; b=akfE0acwnO3erTbqQrcWHtOiwjg5Y4U6u H9P0AR8IJl1Ri6k1Z6LL+np7jx0YnPLpwLhVqc7vzcQab8oF9UJnTnMzov6LixXb NIxbopH6PsfYEu0Ou1vTvqv0A+dmyxYfR8mERCMq3KMJmKbp9CcsxiPQL9C5/z8x 18pELUSp2bseaTJ/O5JR2w/0Ft5JWku9KQA/0BvfWYRZ7SKQvlyXpfyaMr4cmgvr 1yW6fKvRVmgyskhCcWHf6SFp8oyRoZVrC1i+BTKcUT7NM5k0xkbEnDhZ0l0tONeR jOs8QMjur+Fecz+rmNfBweM0djiyKEvZqX3V59yC0UPmSJmkWLSQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrjedugdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomheptehlhihsshgrucft ohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhephedvfffghf etieejgfetfedtgffhvdehueehvdejudfggefgleejgfelfeevgfefnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsseigvddvtd drqhihlhhishhsrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Aug 2021 10:50:19 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 711CA236; Fri, 6 Aug 2021 14:50:16 +0000 (UTC) From: Alyssa Ross To: qemu-devel@nongnu.org Subject: [PATCH] meson: fix logic for gnutls check Date: Fri, 6 Aug 2021 14:49:47 +0000 Message-Id: <20210806144947.321647-1-hi@alyssa.is> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: softfail client-ip=64.147.123.20; envelope-from=qyliss@x220.qyliss.net; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Acked-by: Paolo Bonzini --- 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 #