From nobody Thu May 2 02:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1624448053; cv=none; d=zohomail.com; s=zohoarc; b=K2MlDa0+DDXQhOC2VyuDfDGRx2VqEEyAQsj8kHSqTrZOJfvZHRq+j4RdJCKmu8rVgtbZg2urGYWzcikX1L6AmpzYIpHdDV4n3JLXtpiw3N8zL9K2nBFrK1bWKpjHBz9DpCP/rvyYrF0jKlLMEljXH8TuiiDyJCgEv/caDZMEWpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624448053; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1bfAiSv8GCt0P6DzH4PvdB5xd9jHyBIFQWFSsya+7yc=; b=j4g+cd2luXgWEyy1TxaNQ4oz72PvLOcYe/j3o5J87vHNXfSNHX3FhAoaaZmCGYwkLwOV/Bzmh91R7f9a3weYIRA4FFJjW/iH7KJbldrMyFuwpRN811wF3sIS4L2krGrYe+jK0fr2R3JVgNH+ZADdlEE3wiA9R6tOA0PHhnqc0d8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1624448053826767.944372003804; Wed, 23 Jun 2021 04:34:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-epr5dLqSPU-mkdSvsMZI7A-1; Wed, 23 Jun 2021 07:34:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBC99101F7A5; Wed, 23 Jun 2021 11:34:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6EC2E5C1CF; Wed, 23 Jun 2021 11:34:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D4CBB4EA2A; Wed, 23 Jun 2021 11:34:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15NBY2xb027810 for ; Wed, 23 Jun 2021 07:34:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA1895D705; Wed, 23 Jun 2021 11:34:02 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-176.ams2.redhat.com [10.36.114.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8C105D6D7; Wed, 23 Jun 2021 11:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624448052; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1bfAiSv8GCt0P6DzH4PvdB5xd9jHyBIFQWFSsya+7yc=; b=SILM6IjaRJG0l3hoB/R58H9VW9LQ580zsdUyQay2ez904tnoXqMhpvYLHRkeEOdL3uIIDL lOX7y9Tu5ceYtC/4rhkdZeEjJi71yZQWnvuCgQnCNBXmnvaoDAl5L1lSqm638JdDZspP0B 7YTCgsw9YwnRqf6JzJzpe9J9nEj6zGE= X-MC-Unique: epr5dLqSPU-mkdSvsMZI7A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] build: fix logic for enabling libssh/libssh2 checks Date: Wed, 23 Jun 2021 12:33:55 +0100 Message-Id: <20210623113355.293955-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) When 'driver_remote' is 'auto', the 'enabled()' method does not evaluate to true, causing the libssh/libssh2 checks to be skipped. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 9caae5521b..1fab424fde 100644 --- a/meson.build +++ b/meson.build @@ -1005,7 +1005,7 @@ else endif =20 libssh_version =3D '0.7' -if get_option('driver_remote').enabled() +if not get_option('driver_remote').disabled() libssh_dep =3D dependency('libssh', version: '>=3D' + libssh_version, re= quired: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) @@ -1028,7 +1028,7 @@ else endif =20 libssh2_version =3D '1.3' -if get_option('driver_remote').enabled() +if not get_option('driver_remote').disabled() libssh2_dep =3D dependency('libssh2', version: '>=3D' + libssh2_version,= required: get_option('libssh2')) if libssh2_dep.found() conf.set('WITH_SSH2', 1) --=20 2.31.1