From nobody Sat May 4 21:59:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1603189373; cv=none; d=zohomail.com; s=zohoarc; b=lUR3kR/SRhXUCqTIg/JxdFKzf/1KKAS35fszd8ZDOSM+4KYoMIEP/g3yDmCD2LiRJ+QlYXpT6diGJVUh6G1xDRo58NH1bGk3wL+9UI7QOfc9HEVAJRKXnnG9Uokm5DyQnvmywUqp/0ZFXU1cLkS3xy+uh+qxDVitpnhroM8eb3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603189373; 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=CZeiT7DaQWzfPaeMZcdhK/3qNUgKjunjUzksVM/CG10=; b=OGp02yU9Slf9Htbhqbhu91U5Cy08OaCZVQbQZv8b+8pnhU0y75u7tKEcMsky66MLUekMR/eLoqUhdb23zjr8T2960rTc/ETl4+SvhT9M+yjx+AhZSQcEnkaG92vTBpgXKYzLt2eoe7I/eaW9mQOMibeGbak+LcdtR0+ZYe+6pKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603189373899307.29332506673006; Tue, 20 Oct 2020 03:22:53 -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-442-fcskVxofMWqCcZm7_ROYmg-1; Tue, 20 Oct 2020 06:22:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 954398064AF; Tue, 20 Oct 2020 10:22:44 +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 344B52C31E; Tue, 20 Oct 2020 10:22:44 +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 E84C979FE1; Tue, 20 Oct 2020 10:22:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09KAM5gO030625 for ; Tue, 20 Oct 2020 06:22:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C0A25B4C1; Tue, 20 Oct 2020 10:22:05 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (unknown [10.33.8.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 923885B4BE; Tue, 20 Oct 2020 10:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603189372; 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=CZeiT7DaQWzfPaeMZcdhK/3qNUgKjunjUzksVM/CG10=; b=EGtXSq5Z3J8cZl5TvpND+AZvzhhTeriN9/mbKyBUbeY/6JowThYRGpR48oLV3gnmqE9Z6C YAp45tTFe4Em6F4Wc6fMrFDIaoU56q/Wi8/o4aMl2kTNbc8ylFzZvdTUC7LtzgNoRrJyhu L34f6YxKqs/RW8MfNq2ysFTz6lx8Ee8= X-MC-Unique: fcskVxofMWqCcZm7_ROYmg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: remove non-pkg-config fallback for devmapper Date: Tue, 20 Oct 2020 11:22:00 +0100 Message-Id: <20201020102200.181009-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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) The fallback for distros which lack pkg-config support for devmapper references an undefined variable "tmp". It appears non of our supported build platforms are triggering this bug and so the fallback code can be removed entirely rather than fixed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meson.build b/meson.build index a17d759702..c3ba34bbe0 100644 --- a/meson.build +++ b/meson.build @@ -1020,13 +1020,6 @@ endif =20 devmapper_version =3D '1.0.0' devmapper_dep =3D dependency('devmapper', version: '>=3D' + devmapper_vers= ion, required: false) -if not devmapper_dep.found() - # devmapper is missing pkg-config files in ubuntu, suse, etc - devmapper_dep =3D cc.find_library('devmapper', required: false) - if devmapper_dep.found() and not cc.has_function('dm_task_run', dependen= cies: tmp) - devmapper_dep =3D dependency('', required: false) - endif -endif if devmapper_dep.found() conf.set('WITH_DEVMAPPER', 1) endif --=20 2.25.4