From nobody Fri Apr 19 15:00:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602165562; cv=none; d=zohomail.com; s=zohoarc; b=aZq3nPRsEGlZ7gi4sdOYqwbJZKuyP0U5RSoU/OmD66tSV+9O0P2mS8udAJjn4cSmOOji8IVk4wcIhe+jzgFq8xe5gU/CD3MQAzzQkhOWGb4bUiIMOo8Eq0AXFt9ivn0JMqYJn+xB+iAmyKdDIQI9XOcVf8wb9/VIqI97aRaVDZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165562; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X9m6+XieZQEabdPZOS+XCtuP5qP22sjs6SKsUbFQzzk=; b=Bn3oKokRhNw40TN4vrOvBq4hptGolRFCwIK+AMOeowt1ENlYSZu0pH3ibhTaa8dTOLN6182nkxZ02y0GJuUmAnTuejfVMIsKrsX5WtYkHhLNLgpW9+9Zg/D94QXT0YQ2IGTBvxbq0QqExWRA/2kcprzDtO/PyIFNAWxVCAARNZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602165562538833.3568182256282; Thu, 8 Oct 2020 06:59:22 -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-225-RA7Rt6LwNRipJxCbTtacdA-1; Thu, 08 Oct 2020 09:59:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B0456414E; Thu, 8 Oct 2020 13:59:12 +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 0540561176; Thu, 8 Oct 2020 13:59:12 +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 BFA038C7C4; Thu, 8 Oct 2020 13:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098Dx9Pn013618 for ; Thu, 8 Oct 2020 09:59:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D64F5D9E8; Thu, 8 Oct 2020 13:59:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F7F25D9D5 for ; Thu, 8 Oct 2020 13:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165561; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=X9m6+XieZQEabdPZOS+XCtuP5qP22sjs6SKsUbFQzzk=; b=OUis2oQeEf2jn2Y4UPzBKKoYmjBM/uU3MVo9jKQ8jyXqye6xu5fH7qfRUMaI9EViNXRXwU xIM1xbvQE/6MeBmlo3CfZhRYPmFWmujzupRG78ekubQDJctPDg827+OOH43/jHOOSEQcib I8aPU6aPKNZaUiaSoIeNJdWe43MZnaA= X-MC-Unique: RA7Rt6LwNRipJxCbTtacdA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 01/15] meson_options: change VMware default from enabled to auto Date: Thu, 8 Oct 2020 15:58:50 +0200 Message-Id: <1d60ccf5bcb0bd183218b3cf0aa5fa898ee68802.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 359fcf0a0b..49e418cc82 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -63,7 +63,7 @@ option('driver_secrets', type: 'feature', value: 'auto', = description: 'local sec option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') -option('driver_vmware', type: 'feature', value: 'enabled', description: 'V= Mware driver') +option('driver_vmware', type: 'feature', value: 'auto', description: 'VMwa= re driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') =20 option('secdriver_apparmor', type: 'feature', value: 'auto', description: = 'use AppArmor security driver') --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165562; cv=none; d=zohomail.com; s=zohoarc; b=XhqDP9xAmag9xtv48DFn+7jXLfed1UNVE0cKTdLeXl2x/D33WpRjL67mwKUuucfXgjNn/IIUJ7+Oj3XtuZJZqw3v3C7PjawIac4kMIhERQS7unyNzuILMYgmGZxrAJNuAsZcQ2oAedJmErXimJ7PDh+Rf0fjhUiSWPUJXr/HZLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165562; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3jDCQZFqgxSU6qwD/7kqOCSKBn/eWqmnket03Kbf/Tc=; b=NUrNn8lx+tOQfs3nmColkwSM1/4wG3AKiohyF3Ka4RdloBsl4RGlRlGFiKIWEAsh70ovvlQXIfbyMa30TYCLHkUZpVUdvy1ogrU0QG24aVVbqZqPDWF4QegWLkaboTZ8aIx1Rx++qfAphKkcDx0plbOhURUJZd2Np5fliCKcZZw= 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 1602165562814900.4444863581066; Thu, 8 Oct 2020 06:59:22 -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-572-M2myRBuhPGyQQjMXrRxJbA-1; Thu, 08 Oct 2020 09:59:18 -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 0BBE66414D; Thu, 8 Oct 2020 13:59:12 +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 DBE9C5C1D0; Thu, 8 Oct 2020 13:59:11 +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 A2F818C7C3; Thu, 8 Oct 2020 13:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098Dx9nX013627 for ; Thu, 8 Oct 2020 09:59:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id E70355D9F3; Thu, 8 Oct 2020 13:59:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6392C5D9D5 for ; Thu, 8 Oct 2020 13:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165561; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3jDCQZFqgxSU6qwD/7kqOCSKBn/eWqmnket03Kbf/Tc=; b=Zc3WQ5EypRjpOljKxNP6Hlv7nEwydWyloujnsroke9WUT6Th6mnUrhKQYwg7RTdzCLSKxS kcioILgEZlRNnW3EykqifADRf0UE25G5f026zf3nwTewRfBi++qn+dowv8OUGxQTqHmuu9 S4H/o3FGHzNX/lk8UI0C+epXqP7FmA0= X-MC-Unique: M2myRBuhPGyQQjMXrRxJbA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 02/15] meson_options: change VirtualBox default from enabled to auto Date: Thu, 8 Oct 2020 15:58:51 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 49e418cc82..fafc0d72be 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -61,7 +61,7 @@ option('driver_remote', type: 'feature', value: 'enabled'= , description: 'remote option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') option('driver_secrets', type: 'feature', value: 'auto', description: 'loc= al secrets management driver') option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') -option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') +option('driver_vbox', type: 'feature', value: 'auto', description: 'Virtua= lBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'auto', description: 'VMwa= re driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165564; cv=none; d=zohomail.com; s=zohoarc; b=WcVcPegNkCY7mVmOWYPsE/XkpJIzhn72AX/cQenbLIbd1d9Z90HUsJ1JMSzOhyyXLgI1W8RNSt/kqR8MCEyTGKLfBQUGwWt369J0jv3Cy6bvG60mgU3qmF6T1HqWCQuhbTmxQmvLGizioreA0tPEhrymHhJrjF5rK0ufjqSUtV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165564; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Lj0QR3X7TBdnu5obCaCkei//g5+LF5/Cu8AyGVA/v/c=; b=EBRyQ7r6U4qXyyFsQGhF+q8duvGENVOhUmkAjCxsfByqGjIIDphsIrg3nA6plBtgMcR4M/w3LrUperyjKyhZZYGOQpj1rw6xFrWt4/uGMBOpxuQFDe/gr7Ot5zwyxCrDczC4WY54O2k1/6mXdvHsDsZf3B9VQAfWxDyahgqOijw= 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 1602165564961622.8921569644363; Thu, 8 Oct 2020 06:59:24 -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-100-Sq7RWLPxOMGx5f8AfRH-xg-1; Thu, 08 Oct 2020 09:59:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1F0418BE166; Thu, 8 Oct 2020 13:59:13 +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 B04491EA; Thu, 8 Oct 2020 13:59:13 +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 7DC048C7C6; Thu, 8 Oct 2020 13:59:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxAnJ013634 for ; Thu, 8 Oct 2020 09:59:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C97DD5D9F1; Thu, 8 Oct 2020 13:59:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BA45D9D5 for ; Thu, 8 Oct 2020 13:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165563; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Lj0QR3X7TBdnu5obCaCkei//g5+LF5/Cu8AyGVA/v/c=; b=flnm4SjZ3PJfSCX+4fhFBqU8tk/LlJ/D+Ed9LLvVaVC/YhmyDeBZ1H1d0fivtjDIXvYez1 mtniic7526xdaXRgbtudiTfdyZ9vRoj3kHf3Gqge/JRDdqVWAdLW64ym/J1OOabh/qlTVa QqEMi0LIOfuVMZ+W8zvO8aWe4TtwwgY= X-MC-Unique: Sq7RWLPxOMGx5f8AfRH-xg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 03/15] meson_options: move firewalld options to build feature options Date: Thu, 8 Oct 2020 15:58:52 +0200 Message-Id: <28ea894dff4e99fe64b900080bddd6d275c1f499.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These options don't check for any external libraries, they only enable libvirt features. Signed-off-by: Pavel Hrdina --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index fafc0d72be..36aa763526 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,8 +18,6 @@ option('bash_completion_dir', type: 'string', value: '', = description: 'directory option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('curl', type: 'feature', value: 'auto', description: 'curl support') -option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') -option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') @@ -90,6 +88,8 @@ option('storage_zfs', type: 'feature', value: 'auto', des= cription: 'ZFS backend # build feature options option('chrdev_lock_files', type: 'string', value: '', description: 'locat= ion for UUCP style lock files for character devices (leave empty for defaul= t paths on some platforms)') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') +option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') +option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') option('loader_nvram', type: 'string', value: '', description: 'Pass list = of pairs of : paths. Both pairs and list items are separated= by a colon.') --=20 2.26.2 From nobody Fri Apr 19 15:00:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602165566; cv=none; d=zohomail.com; s=zohoarc; b=YE69656SxlR2hPvHjGVrv3swdjN898/hPDwokBIMvjGyQW8NolKul++45kGixxCuiFvC5NZlzZ3UTz+e4xGtNPfCjcJBjVZzncIG+KrKACrJXnXzzCAZFHSb2GyWq/HFsjV7QWSsnby7MCgu98slmLTbR59MARw11xSzIxvwL0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165566; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AR8ajQPDzSaJ5Pm0LTQmMKpmfPSlxiHM8EGBUOECyTI=; b=PowqelqVm4faw79G93foB3wK658iH/xGb8FUdInhSoXV0ZQsIqiCDOr+PUaKXUWo1hSASNK2DRY2s09RvPpFmddIrTMXeOCvsjb31O8vFP4Ffo0B8IQWG/vSEvobloByXnZmY+AbEQpXTdfGKVtyHbpbmyIYzeqs0h+N3b3lRGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602165566646436.18846555447317; Thu, 8 Oct 2020 06:59:26 -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-583-SCRR25htN1GwuKYyVsOf3A-1; Thu, 08 Oct 2020 09:59:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4749100E075; Thu, 8 Oct 2020 13:59:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 835EB5D9D5; Thu, 8 Oct 2020 13:59:15 +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 4C6E41832FC4; Thu, 8 Oct 2020 13:59:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxBZx013640 for ; Thu, 8 Oct 2020 09:59:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id ABFB35D9F3; Thu, 8 Oct 2020 13:59:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 297FA5D9D5 for ; Thu, 8 Oct 2020 13:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165565; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AR8ajQPDzSaJ5Pm0LTQmMKpmfPSlxiHM8EGBUOECyTI=; b=YYPz5s4+7D0FhOrTtKVJ8ceQligkQMWMN1ZD7ZcHj5wRtB+bWE7t73LfqjIg0cGFytjfd9 aKpAgU0pj+6j/PxK+iBX8yFS5CwO74kEywvoAaq2b56qAR5jI0vzL1g6VqmXonpcd7tqNA Wl+g8wH9h3VRl38fPeunJ+BNEPmWluY= X-MC-Unique: SCRR25htN1GwuKYyVsOf3A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 04/15] meson: no need to call meson.get_compiler() again Date: Thu, 8 Oct 2020 15:58:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index a5ce8e17a8..48d0d00288 100644 --- a/meson.build +++ b/meson.build @@ -1153,7 +1153,6 @@ endif libxml_version =3D '2.9.1' libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) =20 -cc =3D meson.get_compiler('c') m_dep =3D cc.find_library('m', required : false) =20 netcf_version =3D '0.1.8' --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165610; cv=none; d=zohomail.com; s=zohoarc; b=a5/HFz2x/OmhWiTJjTjdLO4swPry6EPMW9m0i4NBeEQF9nsOdOpW7MGyGyJR+cCvOkWrWy/BYsjGGHYUNLtXlltC/x9UnoAtD7x7qETjHOjI+AQmRZ7JWnwkad+3Z7p+Jg0ZeIG+cWKuPlL0OIpbpZbonQEPK5IgiwRWnDwUK8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165610; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xve9dbRgNSl8IBkNnY8N/u17sk1xXqtzFRzf3ktJB9M=; b=WnPZuE9veu/lI2hrFbUFDnXzVhOiLOBafzKpIQSonAdrToOke/nYtdOePJasJT1Kz7vO+idI645hsP2SMzbCKC77NZcuDEIo5ep5LIjI3ZqhmzF65vJWqR+zNISVFPqEP7Gses4QBVtOSbJNYCc/8GqFFYkq+hJo3yuoAB7S4lQ= 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 1602165610822584.8174853717142; Thu, 8 Oct 2020 07:00:10 -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-583-6HxTY5Y-NzO0pkuIESov0A-1; Thu, 08 Oct 2020 09:59:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6C85108E1BE; Thu, 8 Oct 2020 13:59:15 +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 9682768432; Thu, 8 Oct 2020 13:59:15 +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 618118C7C8; Thu, 8 Oct 2020 13:59:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxCsx013652 for ; Thu, 8 Oct 2020 09:59:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EB885D9F1; Thu, 8 Oct 2020 13:59:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C3CA5D9E8 for ; Thu, 8 Oct 2020 13:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165607; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Xve9dbRgNSl8IBkNnY8N/u17sk1xXqtzFRzf3ktJB9M=; b=N92RifCx+1RnIPniRIiRdgJxR6qBmtc33ePLY4KXXqrzhoD/D32xUgC0mgD54tEedxia3q gUfPC8jPc/3c/6DU7DNJMtaxPdQxWz0JSmRfzWi4rrrT+a9aafL4kCeHSbKgqiOpSmZKnV uDGaExWQU0v38oE3Xxlpt5PFKkex5dA= X-MC-Unique: 6HxTY5Y-NzO0pkuIESov0A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 05/15] meson: properly handle libpcap if it's explicitly disabled Date: Thu, 8 Oct 2020 15:58:54 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If libpcap is detected using pkg-config it would ignore the libpcap option. Signed-off-by: Pavel Hrdina --- meson.build | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 48d0d00288..0941be8136 100644 --- a/meson.build +++ b/meson.build @@ -1101,17 +1101,22 @@ if libparted_dep.found() endif =20 libpcap_version =3D '1.5.0' -libpcap_dep =3D dependency('libpcap', version: '>=3D' + libpcap_version, r= equired: false) -if not libpcap_dep.found() - pcap_config_prog =3D find_program('pcap-config', required: get_option('l= ibpcap')) - if pcap_config_prog.found() - pcap_args =3D run_command(pcap_config_prog, '--cflags').stdout().strip= ().split() - pcap_libs =3D run_command(pcap_config_prog, '--libs').stdout().strip()= .split() - libpcap_dep =3D declare_dependency( - compile_args: pcap_args, - link_args: pcap_libs, - ) +if not get_option('libpcap').disabled() + libpcap_dep =3D dependency('libpcap', version: '>=3D' + libpcap_version,= required: false) + + if not libpcap_dep.found() + pcap_config_prog =3D find_program('pcap-config', required: get_option(= 'libpcap')) + if pcap_config_prog.found() + pcap_args =3D run_command(pcap_config_prog, '--cflags').stdout().str= ip().split() + pcap_libs =3D run_command(pcap_config_prog, '--libs').stdout().strip= ().split() + libpcap_dep =3D declare_dependency( + compile_args: pcap_args, + link_args: pcap_libs, + ) + endif endif +else + libpcap_dep =3D dependency('', required: false) endif if libpcap_dep.found() conf.set('WITH_LIBPCAP', 1) --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165675; cv=none; d=zohomail.com; s=zohoarc; b=E7kZwu6aiFRhDH6FmzdicNWjIr8EwHGslocW2i2uu4WRr/TeHcGCztA6T1cfjl0i++CtxTF4x3kW+EKKjRTs4zNiT0/tZkhJxXdhHMlUyzzX1CEF580Hz0V7KiiQe6HkT6j3KPj5Vsvn6OqTn6OWtq4ImC/qQdnlrG1g6liPLw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165675; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NTqvIU94vHTciGfUOtLBjYGueda2L+BYKrSo8UGKjbU=; b=dIkjleSKn5BSvqe1TsFrzSstW+eylfI84HeWod8N2sOqzquCktP97/VRmoL88HAtbnTWAgOnw8XidHYvVQJytiJHVamoWXAUm9E86sSZUNub9PVDWrBuJXgCx6+S9FRsT6NTSR9nJbUwxyslRJZkbBRYJdTGVlwDfusla/balSI= 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 1602165675411349.7700018719304; Thu, 8 Oct 2020 07:01:15 -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-254-gfCJiD5ENBSMlnnHJFSNoQ-1; Thu, 08 Oct 2020 09:59:29 -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 803BD6415E; Thu, 8 Oct 2020 13:59:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D6C355786; Thu, 8 Oct 2020 13:59:18 +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 250381832FD7; Thu, 8 Oct 2020 13:59:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxDGk013664 for ; Thu, 8 Oct 2020 09:59:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 70C425D9D5; Thu, 8 Oct 2020 13:59:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id E32E45D9F1 for ; Thu, 8 Oct 2020 13:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165672; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NTqvIU94vHTciGfUOtLBjYGueda2L+BYKrSo8UGKjbU=; b=fyLlrlbDQkN8PUCaKzJYLrhckywmCIXBCBd3vYoyI1zjKN0GDcf9PE3Ex5gK9ZGUub4e+Y M8YdPzlPOc9ZpSvcfmo4YdAssmOoSYEZkQx0c6TgA4N3FP8mUtDHJniGSU4X2496+a7BYn TPRSjlQAhJvXeja1WVDnkVG0VlFdhhc= X-MC-Unique: gfCJiD5ENBSMlnnHJFSNoQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 06/15] meson: properly handle readline if it's explicitly disabled Date: Thu, 8 Oct 2020 15:58:55 +0200 Message-Id: <82a7c4dd23fe49f7a71e8f5208e550b5a81e0a73.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If readline is detected using pkg-config it would ignore the readline option. Signed-off-by: Pavel Hrdina --- meson.build | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 0941be8136..c1f56e8fdb 100644 --- a/meson.build +++ b/meson.build @@ -1243,26 +1243,30 @@ endif =20 # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' -readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) -if not readline_dep.found() - readline_dep =3D cc.find_library('readline', required: get_option('readl= ine')) +if not get_option('readline').disabled() + readline_dep =3D dependency('readline', version: '>=3D' + readline_versi= on, required: false) + if not readline_dep.found() + readline_dep =3D cc.find_library('readline', required: get_option('rea= dline')) =20 - if readline_dep.found() - # This variable is present in all reasonable (5.0+) readline versions; - # however, the macOS base system contains a library called libedit whi= ch - # takes over the readline name despite lacking many of its features. We - # want to make sure we only enable readline support when linking again= st - # the actual readline library, and the availability of this specific - # variable is as good a witness for that fact as any. - correct_rl =3D cc.has_header_symbol('readline/readline.h', 'rl_complet= ion_quote_character', prefix: '#include ') - if not correct_rl - if get_option('readline').enabled() - error('readline is missing rl_completion_quote_character') - else - readline_dep =3D dependency('', required: false) + if readline_dep.found() + # This variable is present in all reasonable (5.0+) readline version= s; + # however, the macOS base system contains a library called libedit w= hich + # takes over the readline name despite lacking many of its features.= We + # want to make sure we only enable readline support when linking aga= inst + # the actual readline library, and the availability of this specific + # variable is as good a witness for that fact as any. + correct_rl =3D cc.has_header_symbol('readline/readline.h', 'rl_compl= etion_quote_character', prefix: '#include ') + if not correct_rl + if get_option('readline').enabled() + error('readline is missing rl_completion_quote_character') + else + readline_dep =3D dependency('', required: false) + endif endif endif endif +else + readline_dep =3D dependency('', required: false) endif if readline_dep.found() # Gross kludge for readline include path obtained through pkg-config. --=20 2.26.2 From nobody Fri Apr 19 15:00:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602165616; cv=none; d=zohomail.com; s=zohoarc; b=aNwztPdXyp4oCrwdsHF0XZ0RJy9yJrufWJ4816Cyrt5Hc3Blg+kj1ThpTpo3E8MCaNKXCozfOGAG0wmpGslE0eU61aRBYlj66TlhNe61IXv8VeNr6K5ExOeG3+hU43A4ccFr77p7YH5jA+LbsEcxvJRx0GMLE4rH8D+EigqRsjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165616; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FwGlkbvhsTwDHhupxeYzMDWTWna57/p9E5gV+Wuax78=; b=jFHbfaIEtYb4KgzzGoTt/VOmNv876Aof5Yykv9qpucp7Jlv1YO6wKUNwy2syWqHNFvs4PrD47+uPbqIMoTXOKNtttGZh8Lb0/5FVSejRNXCApi66rHRcFzZ2Soq+hDE1WN0+zaNIWPyBrbfa9G3tyXuENEjPmcpsGs6qh15w6rs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602165616895422.0362116187855; Thu, 8 Oct 2020 07:00:16 -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-58-_SKlIIx7Nv2_r7PFYoowyg-1; Thu, 08 Oct 2020 09:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86B9A100E07B; Thu, 8 Oct 2020 13:59:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56C4C1002C24; Thu, 8 Oct 2020 13:59:21 +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 13DC01832FD2; Thu, 8 Oct 2020 13:59:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxEEY013672 for ; Thu, 8 Oct 2020 09:59:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8C1C5D9E8; Thu, 8 Oct 2020 13:59:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id C50C55D9D5 for ; Thu, 8 Oct 2020 13:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165612; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FwGlkbvhsTwDHhupxeYzMDWTWna57/p9E5gV+Wuax78=; b=c2vhvj40UgJ7vQOO2w/4PmHimNDh/KhJJBsLVAj9PtA8FhURIeSoxoUbIREJ4suWSpejt1 C5SlOyMYcdsy+L25yFw7x3B5q5e1r70k8NvUXFE06K6D96LWQgY9QY6xc1YDXAK0tzw2l5 ceCeLOZuKOEqIQxPT3/nj/v+nHboDLE= X-MC-Unique: _SKlIIx7Nv2_r7PFYoowyg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 07/15] meson: build nodedev driver only if libvirtd is compiled Date: Thu, 8 Oct 2020 15:58:56 +0200 Message-Id: <0f6a6f654bdc98e04bb3228dcec90e16b45edd0b.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c1f56e8fdb..bb01731264 100644 --- a/meson.build +++ b/meson.build @@ -1678,7 +1678,7 @@ if not get_option('driver_network').disabled() and co= nf.has('WITH_LIBVIRTD') and conf.set('WITH_NETWORK', 1) endif =20 -if udev_dep.found() +if udev_dep.found() and conf.has('WITH_LIBVIRTD') conf.set('WITH_NODE_DEVICES', 1) endif =20 --=20 2.26.2 From nobody Fri Apr 19 15:00:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602165571; cv=none; d=zohomail.com; s=zohoarc; b=TZmZ5dWfGmiZki2nj2zywFLK1K4OFDsfi8ordBfQsHuKQcv/V84uAWVaflllf+p4kBIrTnpRjZ9T1e1FbLuOiT3SiQWJK8t4u8ElZywyxD8CqMX+KILeSOIXC0Ns3SP/8RIDrdjEOyim2rXWSuRFPzVVbrqzej4KJPx0gbt66lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165571; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cN9yQXNAWSASnYgOxpIpdFOSz2RxzxK/nKHf3h8D6/s=; b=Q8upbMTBh8GvbqWjW4Tr2XIbu8kPSyMPYgWIXLQL//RbHpHW5+7k+c51EMD1OpeUlnXJvZRGe6i3RrglOe2RPFqfC/LzbyaQFWOr+javyeZwtCVYWzfEb229cur9qRqauyseuIPbI4kanH5wFx7ysBJS70Cq5UvY7TXyOR5v9Y8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602165571536720.3059233038005; Thu, 8 Oct 2020 06:59:31 -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-243-sKrdyQKYNVi0imQN0qjdcw-1; Thu, 08 Oct 2020 09:59:26 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C487108E1B8; Thu, 8 Oct 2020 13:59:18 +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 5281B19930; Thu, 8 Oct 2020 13:59:18 +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 1BB308C7D4; Thu, 8 Oct 2020 13:59:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxH8A013696 for ; Thu, 8 Oct 2020 09:59:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 231535D9F3; Thu, 8 Oct 2020 13:59:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 928245D9D5 for ; Thu, 8 Oct 2020 13:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165570; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cN9yQXNAWSASnYgOxpIpdFOSz2RxzxK/nKHf3h8D6/s=; b=J8h98wuoXigh1QS6NiKkRwcvcr3C8dY8Mk88XDgyilBIlH85GWmpA0kSiMspsIMmA2wLKv MgCoOwc9SYQ2v7QR7jsMe/apWG/er0wesCQ0VXzeD8YPHBXEDOoZf3cqsvkl59gM5ULJIx cZJQWhI4JD5H98kyfKImd3xO7zGejYk= X-MC-Unique: sKrdyQKYNVi0imQN0qjdcw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 08/15] meson: add libnl build option Date: Thu, 8 Oct 2020 15:58:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- libvirt.spec.in | 1 + meson.build | 8 +++++--- meson_options.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c0d84c0e75..7c4ccaa659 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1168,6 +1168,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) -Dyajl=3Denabled \ %{?arg_sanlock} \ -Dlibpcap=3Denabled \ + -Dlibnl=3Denabled \ -Daudit=3Denabled \ -Ddtrace=3Denabled \ %{?arg_firewalld} \ diff --git a/meson.build b/meson.build index bb01731264..b6e0b1cb76 100644 --- a/meson.build +++ b/meson.build @@ -1075,9 +1075,9 @@ libiscsi_version =3D '1.18.0' libiscsi_dep =3D dependency('libiscsi', version: '>=3D' + libiscsi_version= , required: get_option('libiscsi')) =20 libnl_version =3D '3.0' -if host_machine.system() =3D=3D 'linux' - libnl_dep =3D dependency('libnl-3.0', version: '>=3D' + libnl_version, r= equired: false) - libnl_route_dep =3D dependency('libnl-route-3.0', version: '>=3D' + libn= l_version, required: false) +if not get_option('libnl').disabled() and host_machine.system() =3D=3D 'li= nux' + libnl_dep =3D dependency('libnl-3.0', version: '>=3D' + libnl_version, r= equired: get_option('libnl')) + libnl_route_dep =3D dependency('libnl-route-3.0', version: '>=3D' + libn= l_version, required: get_option('libnl')) =20 if libnl_dep.found() and libnl_route_dep.found() libnl_dep =3D declare_dependency( @@ -1085,6 +1085,8 @@ if host_machine.system() =3D=3D 'linux' ) conf.set('WITH_LIBNL', 1) endif +elif get_option('libnl').enabled() + error('libnl can be enabled only on linux') else libnl_dep =3D dependency('', required: false) endif diff --git a/meson_options.txt b/meson_options.txt index 36aa763526..b3f4d7744f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,6 +21,7 @@ option('curl', type: 'feature', value: 'auto', descriptio= n: 'curl support') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') +option('libnl', type: 'feature', value: 'auto', description: 'libnl suppor= t') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap su= pport') option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165574; cv=none; d=zohomail.com; s=zohoarc; b=grNFcuUjFaUUud1W6u3G/OHhuc0rCTedU/YjniQIhWfLBgkc4VVXO2Eb/2gu92GOhWQSBEta7EIef8mjWWX+E0uADGpXn+mBG/dE1w+dTSvhLulTrIYAW6zy2ioK1tnDRjXQ/SRCNn4IeqBS+MnshNLbWUKw9o0eBb+bubsItxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165574; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZJga0x5/m0CCHGeV77xS/eyzKPfKjHShEqZxvB+7UiI=; b=AgI+5q5ViBMymGNL4omPur+jrmo7fcqkFYeBKpJqpEkUdZA3zZqobPDaxlKTaPHk2nr6q81sVBYLsPrKy6/bLr5vUb1+6uWQlAHZopKA8JUux0QBCC13/06htl+l24E/gOjDhcERRdFXHiRwc2LES6WeOZ/r0MBeblEcLiT5Yt4= 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 1602165574076871.0340030339421; Thu, 8 Oct 2020 06:59:34 -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-450-3gd1VH-WOS-HeKdNxwm93A-1; Thu, 08 Oct 2020 09:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77A7681107A; Thu, 8 Oct 2020 13:59:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5406D65F5E; Thu, 8 Oct 2020 13:59:21 +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 1972E1832FD4; Thu, 8 Oct 2020 13:59:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxJKN013719 for ; Thu, 8 Oct 2020 09:59:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id D1BF65D9F3; Thu, 8 Oct 2020 13:59:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F92F5D9D5 for ; Thu, 8 Oct 2020 13:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165572; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZJga0x5/m0CCHGeV77xS/eyzKPfKjHShEqZxvB+7UiI=; b=C6svc0cZ8IWGvPBzjzHO0ka+eKqC+PieycktFtAe2CnkhhY/zulOU95pj6bUWcr8+qsyZP KTCnolBuzjkfkR21J8Za+Oroyxb3PSsAyBGyuwnSAjauPcfVEu1uCQrrGKqd1W62dX05q3 rxLp53jy8KlBzLyBF+sUOLbaVoJif1s= X-MC-Unique: 3gd1VH-WOS-HeKdNxwm93A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 09/15] meson: add rbd build option Date: Thu, 8 Oct 2020 15:58:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 26 +++++++++++++++++--------- meson_options.txt | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index b6e0b1cb76..af82f37d32 100644 --- a/meson.build +++ b/meson.build @@ -1228,17 +1228,25 @@ else pkcheck_prog =3D dependency('', required: false) endif =20 -rbd_dep =3D cc.find_library('rbd', required: false) -rados_dep =3D cc.find_library('rados', required: false) -if rbd_dep.found() and not cc.has_function('rbd_get_features', dependencie= s: rbd_dep) - rbd_dep =3D dependency('', required: false) -endif -if rbd_dep.found() and rados_dep.found() - if cc.has_function('rbd_list2', dependencies: rbd_dep) - conf.set('WITH_RBD_LIST2', 1) +if not get_option('rbd').disabled() + rbd_dep =3D cc.find_library('rbd', required: get_option('rbd')) + rados_dep =3D cc.find_library('rados', required: get_option('rbd')) + + if rbd_dep.found() and not cc.has_function('rbd_get_features', dependenc= ies: rbd_dep) + if get_option('rbd').enabled() + error('rbd is missing rbd_get_features') + else + rbd_dep =3D dependency('', required: false) + endif endif =20 - rbd_dep =3D declare_dependency(dependencies: [ rbd_dep, rados_dep ]) + if rbd_dep.found() and rados_dep.found() + if cc.has_function('rbd_list2', dependencies: rbd_dep) + conf.set('WITH_RBD_LIST2', 1) + endif + + rbd_dep =3D declare_dependency(dependencies: [ rbd_dep, rados_dep ]) + endif else rbd_dep =3D dependency('', required: false) endif diff --git a/meson_options.txt b/meson_options.txt index b3f4d7744f..452fdab4d0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -31,6 +31,7 @@ option('numactl', type: 'feature', value: 'auto', descrip= tion: 'numactl support' option('openwsman', type: 'feature', value: 'auto', description: 'openwsma= n support') option('pciaccess', type: 'feature', value: 'auto', description: 'pciacces= s support') option('polkit', type: 'feature', value: 'auto', description: 'use PolicyK= it for UNIX socket access checks') +option('rbd', type: 'feature', value: 'auto', description: 'rbd support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') option('sanlock', type: 'feature', value: 'auto', description: 'sanlock su= pport') option('sasl', type: 'feature', value: 'auto', description: 'sasl support') --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165614; cv=none; d=zohomail.com; s=zohoarc; b=HVqz53lbBbaqSW5bpjire7OETe5rBC2BbPV9MNhXpIaothsYV+22o6ThB71gCysW7mBczwYdp4my1E6vm7lM9JYQXLGZ3U33HdWMNzhJ8WKAZb+e46XrTGfFDmA68YkSoiI2vykT5ZXoE932wSJQsbwWbtJV5TuDEP35dmy6JMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165614; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uk8CunT/Y9BY9/soXPU2LY6AoQ7h+Wxasf1SJ0HzLEk=; b=cKQtbHGawKsB8+nZtiSQGlHtzaYORGjBOfUw/L+KvIGl0hRlgkrBU+SJX2NuzD/la2WTet81kqQJnnt6XhfaBwAnfI4y8J0kny0UQoGYDyOWyhovLla6fmVbfIL0JTOyOdTeCkLCovuwMwf5NXdAjVlx9JWh/MdJs5IDxEt6M4g= 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 1602165614313880.2054167743524; Thu, 8 Oct 2020 07:00:14 -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-nn4jVnp2OuuLSZw_gdtwig-1; Thu, 08 Oct 2020 09:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D08E0108E1A6; Thu, 8 Oct 2020 13:59:25 +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 AB1B21002C2A; Thu, 8 Oct 2020 13:59:25 +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 784B18C7B8; Thu, 8 Oct 2020 13:59:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxM3k013735 for ; Thu, 8 Oct 2020 09:59:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8ED695D9F7; Thu, 8 Oct 2020 13:59:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B1075D9F3 for ; Thu, 8 Oct 2020 13:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165610; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uk8CunT/Y9BY9/soXPU2LY6AoQ7h+Wxasf1SJ0HzLEk=; b=BzTDOblRfe2fBaowd0w2qD/KLetUbLbo/9g2uXZq7PfduuJcfyii/v9gFAV4uJDj5ZC7Ia W52LwinODJCtcnEqsEBl2x3tgZhfW1uVso0TI1ZWbSujKHohMddZzf0F9h96vBOY5YUDIY EEKbRWCXbsFaRqCjLNeDULjUSNEoc4A= X-MC-Unique: nn4jVnp2OuuLSZw_gdtwig-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 10/15] meson: prefix kvm_dep, m_dep and util_dep with lib Date: Thu, 8 Oct 2020 15:58:59 +0200 Message-Id: <8c32b64773d04c854836e6cf243ca4258957add1.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We don't use the lib prefix for all libraries but in these cases it makes sense to use the prefix. Signed-off-by: Pavel Hrdina --- meson.build | 8 ++++---- src/bhyve/meson.build | 4 ++-- src/util/meson.build | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index af82f37d32..cd35756a8a 100644 --- a/meson.build +++ b/meson.build @@ -1066,9 +1066,9 @@ gnutls_dep =3D dependency('gnutls', version: '>=3D' += gnutls_version) =20 # Check for BSD kvm (kernel memory interface) if host_machine.system() =3D=3D 'freebsd' - kvm_dep =3D cc.find_library('kvm') + libkvm_dep =3D cc.find_library('kvm') else - kvm_dep =3D dependency('', required: false) + libkvm_dep =3D dependency('', required: false) endif =20 libiscsi_version =3D '1.18.0' @@ -1160,7 +1160,7 @@ endif libxml_version =3D '2.9.1' libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) =20 -m_dep =3D cc.find_library('m', required : false) +libm_dep =3D cc.find_library('m', required : false) =20 netcf_version =3D '0.1.8' netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) @@ -1380,7 +1380,7 @@ if udev_dep.found() conf.set('WITH_UDEV', 1) endif =20 -util_dep =3D cc.find_library('util', required: false) +libutil_dep =3D cc.find_library('util', required: false) =20 if host_machine.system() =3D=3D 'windows' ole32_dep =3D cc.find_library('ole32') diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 975f93a9c0..2b65eecf5e 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -21,9 +21,9 @@ if conf.has('WITH_BHYVE') ], dependencies: [ access_dep, - kvm_dep, + libkvm_dep, + libutil_dep, src_dep, - util_dep, ], include_directories: [ conf_inc_dir, diff --git a/src/util/meson.build b/src/util/meson.build index 4d63173cbd..3b711b1dc2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -187,13 +187,13 @@ virt_util_lib =3D static_library( devmapper_dep, gnutls_dep, intl_dep, + libm_dep, libnl_dep, - m_dep, + libutil_dep, numactl_dep, secdriver_dep, src_dep, thread_dep, - util_dep, win32_dep, yajl_dep, ], --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165608; cv=none; d=zohomail.com; s=zohoarc; b=BF1JY9P5/e0CmBhK9bz8YhmfQVthJbTZc6tV1K/v7qDxrEfXbmoLxX5ED2M+/+vyjT3X9bwN671AEAVOp6C3O0gZToj4gbwz9h06ga7hI2dMOYTWONOO5Ct6W44qSQPK/DKm7I6N67pOF8DQNHwZvpsG4fyjt4UkYUWcs83UliE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165608; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UzMQiVTZcdOwZ/1av5+T/k3I1u3FoJ7Ipy8z13qyZaY=; b=ghDrV7zhC6MFhzcn/Aguf5JFO5JkSnm/lwHm4Wsp+kSLg5dLaZeCARv85XIsFH8ypn43d9IGq5r67BPqidHnlM31+n71FELmqul8C/NUc4vPhJSCqWTULoyU8QiDuOdUnok2YnxUCZP9bUk1BM7RSjAVmwuBhjhpA88OOKsP4kU= 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 1602165607896593.8473911121613; Thu, 8 Oct 2020 07:00:07 -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-74-iqRZd9rPMJK1LJ33hAqivg-1; Thu, 08 Oct 2020 09:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC3D26414F; Thu, 8 Oct 2020 13:59:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 970B11002C26; Thu, 8 Oct 2020 13:59:29 +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 366391832FD4; Thu, 8 Oct 2020 13:59:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxS4C013755 for ; Thu, 8 Oct 2020 09:59:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2CD425DA33; Thu, 8 Oct 2020 13:59:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D0F35D9FC for ; Thu, 8 Oct 2020 13:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165603; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UzMQiVTZcdOwZ/1av5+T/k3I1u3FoJ7Ipy8z13qyZaY=; b=FyP6kLcEvnHpm05pJhikEHYfPHBmAeMNblbMl3kxHPgvpWhLtkka+02cDfmH5Iy3R9aW3Z pQ9ivDwg4ik0j6TSLUsIlRTMzRcNQmD+tt1aHuZvfTVblqu1WbOV6WpmvzbCCnODMAByab vzx3Tu1uWiyqX2bsw/U/+nHT3tG1/Bo= X-MC-Unique: iqRZd9rPMJK1LJ33hAqivg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 11/15] meson: add missing libraries to summary Date: Thu, 8 Oct 2020 15:59:00 +0200 Message-Id: <5d152f67375130b7cde16c1d0a362ed49b85eaa3.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meson.build b/meson.build index cd35756a8a..e94025d315 100644 --- a/meson.build +++ b/meson.build @@ -2385,6 +2385,7 @@ libs_summary =3D { 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), 'curl': curl_dep.found(), + 'devmapper': devmapper_dep.found(), 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), @@ -2393,16 +2394,21 @@ libs_summary =3D { 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), 'libiscsi': libiscsi_dep.found(), + 'libkvm': libkvm_dep.found(), + 'libm': libm_dep.found(), 'libnl': libnl_dep.found(), + 'libparted': libparted_dep.found(), 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), + 'libutil': libutil_dep.found(), 'libxml': libxml_dep.found(), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, 'nss': conf.has('WITH_NSS'), 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), + 'parallels': parallels_sdk_dep.found(), 'pciaccess': pciaccess_dep.found(), 'pm_utils': conf.has('WITH_PM_UTILS'), 'polkit': conf.has('WITH_POLKIT'), --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165582; cv=none; d=zohomail.com; s=zohoarc; b=B4FYifXw1oD+cRsboDmcAxEqmwdJTVDfRk9awbZODNqwOJWDDkg6U8bZkvaR0mIhErDFOn0fXH6HGI7AXMBnVbAK0ogwtn4CM2WnYO3Ps5O/vDdO1L4GOKaRkeZ8YayaIghDWr/Mj8Ndbils2slrvAJlhPigKAHU9GMLjQm7QSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165582; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CuPkaU8LEG301tnaKfQOybglMDxsMZ3+LPNS5LQdJhM=; b=hiKUk1s9CV8jwwWc4SGvtyrHqSwJpA2LllWFarHgSO7CM9dBxmlhvAl34L/saZUpATi6ZU1EfBj5nNRUOd/5rxvVxt6bXzzQUrA6s8TNuRfFnvVrFBpDtN/bhEi3hHJjQOQYHhKdehwfc0kU1hKn3Hhb+6mp43r82nsOrHQeIUs= 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 1602165582220242.03697053101018; Thu, 8 Oct 2020 06:59:42 -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-420-ML2w92g6NpG_Z-S284hvqQ-1; Thu, 08 Oct 2020 09:59:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F7F118BE173; Thu, 8 Oct 2020 13:59:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D7576EF60; Thu, 8 Oct 2020 13:59:33 +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 238281832FC5; Thu, 8 Oct 2020 13:59:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxVbN013778 for ; Thu, 8 Oct 2020 09:59:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D7A45D9F1; Thu, 8 Oct 2020 13:59:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6585D9FC for ; Thu, 8 Oct 2020 13:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165581; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CuPkaU8LEG301tnaKfQOybglMDxsMZ3+LPNS5LQdJhM=; b=SNJYH7OD3zMiPPWRw5f4n2ZTw3Sdl0RIZqI4vSv+O0jfvYs9kkm/w+8c8e3KAijxLk5z1W qIIeBc1dM9u9aibTzMSYwEmj5BpFYYfw+INpILFsRSseZjDTfU+bDdGOk9rvBa3wlctdjw blbJonR2iihdkdwQi+OUT5w9uRlt/ds= X-MC-Unique: ML2w92g6NpG_Z-S284hvqQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 12/15] meson: remove required libraries from summary Date: Thu, 8 Oct 2020 15:59:01 +0200 Message-Id: <7793183a344b9713600108e6d69dd4c18a71a0a1.1602165221.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These are always enabled so it doesn't make any sense to have the result in summary as meson will fail if they are missing. Signed-off-by: Pavel Hrdina --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build index e94025d315..5a99f59b0c 100644 --- a/meson.build +++ b/meson.build @@ -2390,9 +2390,7 @@ libs_summary =3D { 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), - 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), - 'gnutls': gnutls_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libkvm': libkvm_dep.found(), 'libm': libm_dep.found(), @@ -2402,7 +2400,6 @@ libs_summary =3D { 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), - 'libxml': libxml_dep.found(), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, 'nss': conf.has('WITH_NSS'), --=20 2.26.2 From nobody Fri Apr 19 15:00:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602165583; cv=none; d=zohomail.com; s=zohoarc; b=ndpu1oSPjHEtAVc7yfVw9iqwmrluPw032+wogHfMjKcUHkD4xmCgKKetPM4ysoKzDR+c3bgR4c/2cl7LkOGqkK+d1WM0mEQKx4U1RMl36Vbxft+jE4aP/HyXwc79T8xFaFh1fQieU8UCpnrzJqPRYdXkQzXm9qrE4/8AJVVCRS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165583; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b6uNE50mGkvy5+DdoJPoc6R2g3GbHOKwuwjsHWL3JXU=; b=Y8c3ffCzzDlA8IKM/NHDxgjxHR7Mu4ErU4C2wf4REkoa3Z+T5tVpkNif35s7t6mJW/gguaoryAnxKQZJZ5j1objula/TOspAj2q1upqWtg5zeRYn1mQT+hwQHgvAF1oDL0IhXnGRYGzx0/rLOTn4u+NBRu8Ut4tY2DhRH1ihNuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602165583052471.5910895724255; Thu, 8 Oct 2020 06:59:43 -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-45-Sg7YDjLNPNmJuRbmYpgqSQ-1; Thu, 08 Oct 2020 09:59:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 570C7811065; Thu, 8 Oct 2020 13:59:33 +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 30BE35D9F1; Thu, 8 Oct 2020 13:59:33 +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 F1A5F8C7C5; Thu, 8 Oct 2020 13:59:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxWnd013801 for ; Thu, 8 Oct 2020 09:59:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 03E685DA33; Thu, 8 Oct 2020 13:59:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7111C5D9F1 for ; Thu, 8 Oct 2020 13:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165581; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=b6uNE50mGkvy5+DdoJPoc6R2g3GbHOKwuwjsHWL3JXU=; b=LtBj+OcJmJaEknBDJkwnqiYbtR1tkd8gERx9U/vTcPFbvk00mHcn1Uh6yBLr2IP+v9Hk1h Cqc0LAvYWBS54tL482xfUurd1qoN51Sr+pCfreHuTlZk1w2UeYgfmrtlGfA4t/spZ3atng AlNorL14yRRhXPr4xohcji7K8UOB9xQ= X-MC-Unique: Sg7YDjLNPNmJuRbmYpgqSQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 13/15] meson: move build feature options to miscellaneous summary Date: Thu, 8 Oct 2020 15:59:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.14 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5a99f59b0c..d53909948e 100644 --- a/meson.build +++ b/meson.build @@ -2387,8 +2387,6 @@ libs_summary =3D { 'curl': curl_dep.found(), 'devmapper': devmapper_dep.found(), 'dlopen': dlopen_dep.found(), - 'firewalld': conf.has('WITH_FIREWALLD'), - 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), 'glusterfs': glusterfs_dep.found(), 'libiscsi': libiscsi_dep.found(), @@ -2402,12 +2400,10 @@ libs_summary =3D { 'libutil': libutil_dep.found(), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, - 'nss': conf.has('WITH_NSS'), 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'parallels': parallels_sdk_dep.found(), 'pciaccess': pciaccess_dep.found(), - 'pm_utils': conf.has('WITH_PM_UTILS'), 'polkit': conf.has('WITH_POLKIT'), 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), @@ -2441,10 +2437,14 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'firewalld': conf.has('WITH_FIREWALLD'), + 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), + 'nss': conf.has('WITH_NSS'), 'numad': conf.has('WITH_NUMAD'), 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Loader/NVRAM': loader_res, + 'pm_utils': conf.has('WITH_PM_UTILS'), 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165922; cv=none; d=zohomail.com; s=zohoarc; b=l5vE83i7sPol5gw5hIJNcjjLnd2VyrOjGNMvqN937WfZUfHlTsMHlGsJkPZt/Hk1AfT6mL7drUk5Iqx0+w+1I7z8VYBwRm3qaYbwKjMnIDRMUv1IGiw46MMuziPCjDHbQ8AmSMT+SzLfobOXh/pQHXG3MUso/uyL6KChZaL9248= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165922; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BggmApS15NqUhISXLZ25mrb4yqdpxicKDYiuWeBzAH8=; b=SnPEg/UfYMN7S/MuHuGiaFev6WhKv/D0hn+OOC5udw2U8Ro4kOhz/qZphGF5YHoJ1QyXMmJdRvMXWnh2Gm3F/rn6vLDwFrTU+bELHyYokINHrgAv/dqz9DDFbEJpf30MqM2VRRgMle9VTxgPNLKWLfgizWO7uYqAcVn1ppm1B/A= 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 1602165922140121.27570731184937; Thu, 8 Oct 2020 07:05:22 -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-356-mjuqImMVPSeQD1IWzPOCkA-1; Thu, 08 Oct 2020 09:59:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FEF464148; Thu, 8 Oct 2020 13:59:36 +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 097D419D7D; Thu, 8 Oct 2020 13:59:36 +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 C7B418C7C9; Thu, 8 Oct 2020 13:59:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxWZo013808 for ; Thu, 8 Oct 2020 09:59:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id D71235D9FC; Thu, 8 Oct 2020 13:59:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 545785D9F1 for ; Thu, 8 Oct 2020 13:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165663; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BggmApS15NqUhISXLZ25mrb4yqdpxicKDYiuWeBzAH8=; b=RtOZh+O6XnWzG7BFV6JmaNcHa8v6kPsYM4GTGG1L/5KSrsipn4KU4MZmQFJayjsi8PXzfy nA+UX0HLgWL+NBty5F23Vq7gDiK2KUHzIYPuFu/EJ60GydTTb0DzChk5bJdD2zblQ3/Ok9 S440xIr160SRMNlnyoFQZ8zlLobQxaw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165735; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BggmApS15NqUhISXLZ25mrb4yqdpxicKDYiuWeBzAH8=; b=WlmtI0VZgP2n+wT35wHRbQ0C/mZIQaKKX2WIC9JsMGyqdtOkqDZFpI3Miti9crlmdV/vqR CO909If1ok4hNL5uW1JSCbldAoQMkj8yeve9RxQiZtQsD8hmq2n8BTGv6H0HBdJT4EY/eP AXP/C2fpJZPsNIdRRlg+XurXiqQ/Kww= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165919; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BggmApS15NqUhISXLZ25mrb4yqdpxicKDYiuWeBzAH8=; b=f+k00Ks78O93nXQmXkyVvycWOTCydwFY0IAeRBci5ZWJ+lJy621pungJwmRx0djWe2tRr4 02TYUWNuw+DwBrabyYdrUOscKG/UGQNXBO/Wc6jt5myfBGfrGlR6kc7YLGNznyXxZpAapZ pYbTEhN0rLkVX5GdJhZA320U+aaMsyQ= X-MC-Unique: mjuqImMVPSeQD1IWzPOCkA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 14/15] meson: add docs option to enable/disable generating documentation Date: Thu, 8 Oct 2020 15:59:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- libvirt.spec.in | 1 + meson.build | 6 +++++- meson_options.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c4ccaa659..ef70e4dd29 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1184,6 +1184,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) %{?enable_werror} \ -Dexpensive_tests=3Denabled \ -Dinit_script=3Dsystemd \ + -Ddocs=3Denabled \ %{?arg_login_shell} =20 %meson_build diff --git a/meson.build b/meson.build index d53909948e..f44cb4424a 100644 --- a/meson.build +++ b/meson.build @@ -2211,7 +2211,10 @@ subdir('examples') =20 subdir('po') =20 -subdir('docs') +gen_docs =3D not get_option('docs').disabled() +if gen_docs + subdir('docs') +endif =20 subdir('build-aux') =20 @@ -2436,6 +2439,7 @@ endif misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'docs': gen_docs, 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), diff --git a/meson_options.txt b/meson_options.txt index 452fdab4d0..3c6d6a03c5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,7 @@ option('expensive_tests', type: 'feature', value: 'auto', d= escription: 'set the option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to i= nclude rpath information in installed binaries and libraries') +option('docs', type: 'feature', value: 'auto', description: 'whether to ge= nerate documentation') =20 =20 # build dependencies options --=20 2.26.2 From nobody Fri Apr 19 15:00:59 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=1602165629; cv=none; d=zohomail.com; s=zohoarc; b=euxguHvYMn8fWaNYGE+kZJFjSBYhcGjDfxT595Kfxl0ibgs31OwSRSTxcatTrCNmjHMDNIGlPQvTbd/lOWqD7UfOuOiqBOUNkyX83JQ5GBqO8VsikpntBjsBTfX+/UF+Qnqf2Uoc/krB6BloHXEQJNAAI0hGuJq1ajXAZ2Rkdc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602165629; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bBqJyqyoLAK0nkbtYvX+crfTxc3VGDyOEqaRySEqVWs=; b=Yd8ZnlMS24MowcvD/eT3sheUvRmKQkTixiVCyPcmrMGdZt8EaVJ95Y6RUHNy31UriWVbYQzhq20HQJNx80YNhXjdFYfmOtdY+wiY/mi7hOPKgWmpFgospALxR99aYXHmETzQsXRGf/jsvfrD7OVBNOQg3Q/r6U2EmEmyIAhYt5I= 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 1602165629013408.41132859040465; Thu, 8 Oct 2020 07:00:29 -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-412-uEB3oRQFO2CQR54s2xPsZg-1; Thu, 08 Oct 2020 09:59:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25C0E8A6368; Thu, 8 Oct 2020 13:59:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 052506EF68; Thu, 8 Oct 2020 13:59:38 +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 C49561832FD7; Thu, 8 Oct 2020 13:59:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 098DxZqg013847 for ; Thu, 8 Oct 2020 09:59:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id B96E65D9FC; Thu, 8 Oct 2020 13:59:35 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 351095D98A for ; Thu, 8 Oct 2020 13:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602165626; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bBqJyqyoLAK0nkbtYvX+crfTxc3VGDyOEqaRySEqVWs=; b=cCGXqily6P0ST5kxS6RJAR8vhEDki15fUJ+EA5lzthV7kNXgIheHFjz6645c1fd4Ukwmvl GUAaGkKHs4urp3qkZ5loJ00DqOHmki60/BaGBS2It424TfdSca4eL3Be1pkpDxxC6ICva/ 7FQfKlRtyxVbv1uDY68Edv2Lh3RXVk4= X-MC-Unique: uEB3oRQFO2CQR54s2xPsZg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 15/15] meson: add tests build option to enable/disable unit tests Date: Thu, 8 Oct 2020 15:59:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- meson.build | 6 +++++- meson_options.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f44cb4424a..9f8c43d5ab 100644 --- a/meson.build +++ b/meson.build @@ -2205,7 +2205,10 @@ subdir('src') =20 subdir('tools') =20 -subdir('tests') +build_tests =3D not get_option('tests').disabled() +if build_tests + subdir('tests') +endif =20 subdir('examples') =20 @@ -2440,6 +2443,7 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'docs': gen_docs, + 'tests': build_tests, 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), diff --git a/meson_options.txt b/meson_options.txt index 3c6d6a03c5..78be491704 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,6 +8,7 @@ option('test_coverage', type: 'boolean', value: false, desc= ription: 'turn on cod option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to i= nclude rpath information in installed binaries and libraries') option('docs', type: 'feature', value: 'auto', description: 'whether to ge= nerate documentation') +option('tests', type: 'feature', value: 'auto', description: 'whether to b= uild tests') =20 =20 # build dependencies options --=20 2.26.2