From nobody Tue Feb 10 16:18:19 2026 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=1616611106; cv=none; d=zohomail.com; s=zohoarc; b=krlaylR8LpWoPMM6RobTpLD8QR4xwGHV4BDdWb7hKgWGhge2l/ULzWIqPEh48YJH2dZhsMLILjnPkltXSmkjex7xy+a8LmtrMdmTI4GqKORAvQyZtgbFKGBphCHl+1uUJty+HcYwgdv6X7a9sMcV/s0NPudw9HT7lqgc9fAoYjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616611106; 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=5e9gzQ7dYQuYWXUKGqQPqTvKUbE57Lm4cRJGv1JWVpU=; b=FZzm8qAV26TYo2RXOk/MBnUmuV8I2PMSAbMd1WKbINK90MfnUebraEW3JAuEWK2KL+TPApfd9eta3Pt+AsmMducvVJn3bgXT84vCsg5gNrpCGvykwoftGlEsRO1bjzghyDKxPxOvvKGXE8qwnEolg4ctpYSsPiJKiWC/FbhZSfU= 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 1616611106068436.04508411148447; Wed, 24 Mar 2021 11:38: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-404-2LUnLP9ZNjqMKEPldH7b5w-1; Wed, 24 Mar 2021 14:38:17 -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 C5F881058C63; Wed, 24 Mar 2021 18:38: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 987BA10016FC; Wed, 24 Mar 2021 18:38: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 560F14A7CB; Wed, 24 Mar 2021 18:38:12 +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 12OIc9Jk017945 for ; Wed, 24 Mar 2021 14:38:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98D751002D71; Wed, 24 Mar 2021 18:38:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF64510016FC for ; Wed, 24 Mar 2021 18:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616611100; 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=5e9gzQ7dYQuYWXUKGqQPqTvKUbE57Lm4cRJGv1JWVpU=; b=Lt5XIseJzPghNpPjj7HY1E83GSFJCTrgYQr6ajsOiX148QIXxWqU0nbtuZYHD3eCnlttkI twrNnxpIqMOIJeIuB4ma+1yFVkT6WNPGgNSi36KId30Kv2N9sSEOby4hiC6ztdoPzP0HOS 0x76eTzwghYEsDLUAaMdno9wxewO1wI= X-MC-Unique: 2LUnLP9ZNjqMKEPldH7b5w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] meson: Reorganize looking for programs Date: Wed, 24 Mar 2021 19:37:58 +0100 Message-Id: <20210324183800.201678-3-abologna@redhat.com> In-Reply-To: <20210324183800.201678-1-abologna@redhat.com> References: <20210324183800.201678-1-abologna@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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" While this change doesn't look like it would improve things and actually introduces a tiny bit of duplication, it's necessary in order to prepares the stage for further changes. Signed-off-by: Andrea Bolognani --- build-aux/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 06b7a7c01f..c56a348946 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -10,12 +10,14 @@ syntax_check_conf.set('flake8_path', flake8_path) syntax_check_conf.set('runutf8', ' '.join(runutf8)) syntax_check_conf.set('PYTHON3', python3_prog.path()) =20 - -grep_prog =3D find_program('grep') - if host_machine.system() =3D=3D 'freebsd' make_prog =3D find_program('gmake') +else + make_prog =3D find_program('make') +endif =20 +if host_machine.system() =3D=3D 'freebsd' + grep_prog =3D find_program('grep') grep_cmd =3D run_command(grep_prog, '--version') if grep_cmd.stdout().startswith('grep (BSD grep') grep_prog =3D find_program('/usr/local/bin/grep', required: false) @@ -28,7 +30,7 @@ if host_machine.system() =3D=3D 'freebsd' endif endif else - make_prog =3D find_program('make') + grep_prog =3D find_program('grep') endif =20 syntax_check_conf.set('GREP', grep_prog.path()) --=20 2.26.3