From nobody Sat May 4 19:21:58 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=1601025619; cv=none; d=zohomail.com; s=zohoarc; b=Dan8c8cgmzpDAO9WNVvkSXYtsu1WYgPMs9ZAPnydNivjW7Ws+sDENYnsD9ZS5FWz2IPk2xrl3b7yyDzvjF8nJeUcUYAzLV7CYm7ejbV3aL8DDqpqJKg6dx04GlSLe0c3VJbZNJ5kme9pd4Hj7zM25tbINv3irv2DSyGRFxiDrWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601025619; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=lyeMkxttLi8TaWZP3tMLwHpPXQuDtXsNdbZi6CsyGGk=; b=jfm5yEvVggcLUwCAC0SniBu14itAhzVULUrd+Hf5iAKtPXTocI7hagoT1nPj3ykvLZVY54mFLtRN5zze5/ml2XVzBPm74aQdSpkeSA5VtKWLKoV/VYX2CeEHPQZdzwgY8VsFcj10HkuEzdZ0Q+jc1jlxzJWIMQPZYg/Nn0xxRzM= 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 1601025619661747.5694927784637; Fri, 25 Sep 2020 02:20:19 -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-524-Zh-OPEzCNqKuto9UUC3ySw-1; Fri, 25 Sep 2020 05:20:16 -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 4053980B702; Fri, 25 Sep 2020 09:20:11 +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 1A85A60C17; Fri, 25 Sep 2020 09:20: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 D9CAA79FF7; Fri, 25 Sep 2020 09:20:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08P9KADK002150 for ; Fri, 25 Sep 2020 05:20:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 49BC99CBA; Fri, 25 Sep 2020 09:20:10 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-208.ams2.redhat.com [10.36.114.208]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7486F78822; Fri, 25 Sep 2020 09:20:05 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601025618; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lyeMkxttLi8TaWZP3tMLwHpPXQuDtXsNdbZi6CsyGGk=; b=F3to1quWYRyvejEURcORrO1e0kt76lwRlU6pgmqQwHN09NWeUpVam9/Lkbm3MMeqXReXK8 nGXbAFNTfyNVgbu3jeXkq9e3dzwCDrUJXK14gk6WeANHo8sHrP8eYcNG4KMseWj0GpaoiF 7N4tXG//1GEG3xFfvQ69R1jpOkSo/m0= X-MC-Unique: Zh-OPEzCNqKuto9UUC3ySw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] meson: don't check for libutil.h except on FreeBSD Date: Fri, 25 Sep 2020 10:20:03 +0100 Message-Id: <20200925092003.2195061-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The libutil.h we are after is explicitly only something we want on FreeBSD, we don't want to accidentally pick up this header on other platforms as it can lead to build failures. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko Reviewed-by: Neal Gompa --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4d42468a51..bc52079809 100644 --- a/meson.build +++ b/meson.build @@ -685,7 +685,6 @@ headers =3D [ 'asm/hwcap.h', 'ifaddrs.h', 'libtasn1.h', - 'libutil.h', 'linux/kvm.h', 'linux/magic.h', 'mntent.h', @@ -711,6 +710,10 @@ if host_machine.system() =3D=3D 'linux' headers +=3D 'linux/devlink.h' endif =20 +if host_machine.system() =3D=3D 'freebsd' + headers +=3D 'libutil.h' +endif + foreach name : headers if cc.has_header(name) conf.set('WITH_@0@'.format(name.underscorify().to_upper()), 1) --=20 2.26.2