From nobody Sun Feb 8 14:12:03 2026 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=1617879532; cv=none; d=zohomail.com; s=zohoarc; b=bpLkbRvY57Hezrl/E4D0/X9aQcTExZJiIy8/aBXWvivo/FBc5dtj1r1dS+nsRmagVpaTkD7MU7N1OSprmCqWCe+/aEkzdxddwR9G5HdKSzNjLoQDQt+SeZPTyon7WkB1Akcz7YYYOKw2l2TU/yOXFOIUKlTVl22OO7j6adg72rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617879532; 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=o2M9O8Cbo11UMaN8HyBxhQnlf7hHvU+3Kn0cTMjSl6I=; b=NNCejm/SiVK1F7C48LhjxMasZldyHv8jot94g5Fu2Z52OkyPKTxcwQHLwwVnqUuxyowDBjU6N20JAJW37rKhC+txwarD5l/3oiQI5F9h3v58J3hI7+BLdvKiId+6LtwIK/OCm+mYos7/gS+pPih0tHk15dwiBIzbpjUcyd4hxHQ= 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 1617879532560658.3878434267655; Thu, 8 Apr 2021 03:58:52 -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-105-sK6OTZSfO9aLpoPNbjSDjw-1; Thu, 08 Apr 2021 06:58:48 -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 31908107ACCA; Thu, 8 Apr 2021 10:58:42 +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 05F2210013D7; Thu, 8 Apr 2021 10:58:42 +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 BE5321806D13; Thu, 8 Apr 2021 10:58:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 138AwZH6006266 for ; Thu, 8 Apr 2021 06:58:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC02C10016FD; Thu, 8 Apr 2021 10:58:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-81.ams2.redhat.com [10.36.115.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FDA110013D7; Thu, 8 Apr 2021 10:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617879531; 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=o2M9O8Cbo11UMaN8HyBxhQnlf7hHvU+3Kn0cTMjSl6I=; b=UfUkV/2Z4ys6DoaacB+pF/xbcT45IDK2lfFz0G8K9ME3fYw+rSdA996anhfaeHfBBd7T/3 cf5iLzhTWqDb5TOBGGSwqUuSWYKyAfFoC3MVywYhsMUT9vCSDdQqNOUNbmvrQ1aJKsdF88 NCAoTMGEVO/ZC4QhQ1k+tNzOE4wdxdQ= X-MC-Unique: sK6OTZSfO9aLpoPNbjSDjw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] meson: don't probe for -Werror if -Dwerror is enabled Date: Thu, 8 Apr 2021 11:58:23 +0100 Message-Id: <20210408105823.462584-7-berrange@redhat.com> In-Reply-To: <20210408105823.462584-1-berrange@redhat.com> References: <20210408105823.462584-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Meson has its own mechanism to turn on -Werror with the -Dwerror option. If this is set, then there is no reason for libvirt to check for -Werror itself. We remove the summary line output because it is potentially misleading when libvirt hasn't enabled -Werror, but meson has. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 9fda0c7948..725d0e1cf0 100644 --- a/meson.build +++ b/meson.build @@ -207,7 +207,7 @@ cc =3D meson.get_compiler('c') cc_flags =3D [] =20 git_werror =3D get_option('git_werror') -if git_werror.enabled() or git_werror.auto() and git +if (git_werror.enabled() or git_werror.auto()) and git and not get_option(= 'werror') cc_flags +=3D [ '-Werror' ] endif =20 @@ -2300,7 +2300,6 @@ else loader_res =3D '' endif misc_summary =3D { - 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'docs': gen_docs, 'tests': build_tests, --=20 2.30.2