From nobody Sun May 5 03:15:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596878564; cv=none; d=zohomail.com; s=zohoarc; b=Ho/UG9y7/O8nuvGACcCtxt5upyN1z0m00MIuEgoS6u+gh6hqgFoDFj0aDnDh6+krdRbCGAegnBgo9B9UBCKjiSYJRCghoQRcyfSgm8eZuRf2uiL/XRcOrjPBbHcM7aMtya6IiFj/R5lco3nm5f72ym3W8o8wDtC6spGdAX6OvJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596878564; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ZcXNHdwsG0a6ojkyhGi8jovvtAtgtbCPJKiA4ULc6aA=; b=A9KZWEZKgtbbhxO101klmLDbYFLkEV82Vdr0zws0lH1KUBOj88tU/6+/fEO6C7wsGRUKfJHUSFYqgI2BXckFzm9+PxUR3Zl4XKYMxcSpekheAW8UO7BPn2oefsHw9Btnwd91IsjhkMmHwl3m6blYIBIz2ohN6yNM5m/aUTXdl7E= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 159687856425772.10348475339538; Sat, 8 Aug 2020 02:22:44 -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-134-thhi7NHxNb2LAyaOUc49Ow-1; Sat, 08 Aug 2020 05:22:40 -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 0FC25800688; Sat, 8 Aug 2020 09:22: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 68815726A3; Sat, 8 Aug 2020 09:22:32 +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 2457B180954D; Sat, 8 Aug 2020 09:22:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0789MTNY015524 for ; Sat, 8 Aug 2020 05:22:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 781F220316D6; Sat, 8 Aug 2020 09:22:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7382420316D5 for ; Sat, 8 Aug 2020 09:22:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6360E185A78B for ; Sat, 8 Aug 2020 09:22:27 +0000 (UTC) Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-XBIrNc3tMoe2N7Ocy6hqpQ-1; Sat, 08 Aug 2020 05:22:25 -0400 Received: by mail-lf1-f66.google.com with SMTP id d2so2238880lfj.1 for ; Sat, 08 Aug 2020 02:22:24 -0700 (PDT) Received: from kloomba.my.domain ([31.29.247.181]) by smtp.gmail.com with ESMTPSA id s4sm4831832lja.124.2020.08.08.02.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2020 02:22:22 -0700 (PDT) X-MC-Unique: thhi7NHxNb2LAyaOUc49Ow-1 X-MC-Unique: XBIrNc3tMoe2N7Ocy6hqpQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZcXNHdwsG0a6ojkyhGi8jovvtAtgtbCPJKiA4ULc6aA=; b=bUaApSTyEqAxNg1TBC7li6NKxoMM6cJtAlDsBCXImNnsI5hl+Qc7sR0tFYjvCW/zie /39zbXLxPtqc6nYKtJKZ9OgrzV8/z7ChGEDiJlufIYyIjl57lKAhUhoYzcmj9nrcWOCZ e9WR6qu7EdW27UtEVn803Y3pbNc9mPipomAkl++uAQCfeQHP7iXxZYeO/N2RUdGHBfzH N0ftFt63KSu3HHFl76UdFl9Buf55d5S0VS6PrpxoVS1Zgw3xauC4a5V2POzxul/VmrUj C8aUVq3yS5mM2a8pJ17GW3G+CqwtVOSeJUEZVkqWKwr7T9OStl91+MFqqsKg/MWd1bns HUJQ== X-Gm-Message-State: AOAM532CZyIq4RaCA/YdF42jqudnqo6084eFxI2dRtBw5JSYuM81DYD8 k3m3mMc+flPn5AZCxsJ0dtWT7lc9X6Q= X-Google-Smtp-Source: ABdhPJzCSaamaAmMi014dn+lDuxknmVJBD2aOIh5Iu/gJqjhiKksiVBGKt9IStKjKnhmNO11SLMKLQ== X-Received: by 2002:ac2:5b46:: with SMTP id i6mr8292483lfp.135.1596878543053; Sat, 08 Aug 2020 02:22:23 -0700 (PDT) From: Roman Bogorodskiy To: libvir-list@redhat.com Subject: [PATCH] meson: fix some FreeBSD checks regressions Date: Sat, 8 Aug 2020 13:22:09 +0400 Message-Id: <20200808092209.65263-1-bogorodskiy@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Roman Bogorodskiy 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 Content-Type: text/plain; charset="utf-8" * Add missing prerequisite headers for checking link_addr(3) in net/if_dl.h, * Add missing prerequisite headers for checking BRDGSFD, BRDGADD, BRDGDEL in net/if_bridgevar.h, * When checking for ifconfig(8), set not only IFCONFIG value, but also IFCONFIG_PATH as it's used in util/virnetdevip.c. Signed-off-by: Roman Bogorodskiy Reviewed-by: Pavel Hrdina --- meson.build | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 19b4795527..0913308bec 100644 --- a/meson.build +++ b/meson.build @@ -770,7 +770,7 @@ symbols =3D [ [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], =20 # Check for BSD approach for setting MAC addr - [ 'net/if_dl.h', 'link_addr' ], + [ 'net/if_dl.h', 'link_addr', '#include \n#include ' ], ] =20 if host_machine.system() =3D=3D 'linux' @@ -791,15 +791,18 @@ if host_machine.system() =3D=3D 'linux' endif =20 foreach symbol : symbols - if cc.has_header_symbol(symbol[0], symbol[1], args: '-D_GNU_SOURCE') + if cc.has_header_symbol(symbol[0], symbol[1], args: '-D_GNU_SOURCE', pre= fix: symbol.get(2, '')) conf.set('HAVE_DECL_@0@'.format(symbol[1].to_upper()), 1) endif endforeach =20 # Check for BSD approach for bridge management -if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD') and - cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD') and - cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL')) +brd_required_headers =3D '''#include +#include +#include ''' +if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD', prefix: brd_requ= ired_headers) and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD', prefix: brd_requ= ired_headers) and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL', prefix: brd_requ= ired_headers)) conf.set('HAVE_BSD_BRIDGE_MGMT', 1) endif =20 @@ -900,6 +903,7 @@ foreach name : required_programs prog =3D find_program(name, required: true, dirs: libvirt_sbin_path) varname =3D name.underscorify() conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog.path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 --=20 2.27.0