From nobody Tue Sep 9 18:59:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747766173052351.783390875097; Tue, 20 May 2025 11:36:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 17F62163A; Tue, 20 May 2025 14:36:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4CD9BA92; Tue, 20 May 2025 14:35:55 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 72DE79CB; Tue, 20 May 2025 14:35:52 -0400 (EDT) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7038A9A9 for ; Tue, 20 May 2025 14:35:51 -0400 (EDT) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ad56cbc7b07so372936966b.0 for ; Tue, 20 May 2025 11:35:51 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6005a6dfbc3sm7532379a12.33.2025.05.20.11.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 11:35:48 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747766149; x=1748370949; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=p/gnIeg7wqOCcLseUsJ0FGcw07FVEmSVSaLRIclvBEM=; b=SrNZLzgnq3lb7gLskwQyZuhQDCW7+r02u1M4i+SPeWkslBCF/KwbUgjfAKNMK0idiV nFhA/tcLmZDetKMCsq6iurWnpyn2YDr8uj0nM9ULF6rHkXHSpMutJOJkLECYm8a8H2Bn YLQiDlcEKMJ9lq5UrvF0pUY1lqSCKlMIngpTXpt2qrBF3ezUtaczgllIXnvxAqpeYLY4 1Xaoda/P8q50LC+CE5PTarRK98RSvJJhy/9ZDM4FCU55PE0ls4Ga7mJPpWXPOeY++Nnt A/HTtcB0FLvssj66eISZNgKC3TZ6J0Y7b68+U0iGihrZpWK56HcE+9EIGvKK/WXvqsi9 EUog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747766149; x=1748370949; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p/gnIeg7wqOCcLseUsJ0FGcw07FVEmSVSaLRIclvBEM=; b=H80j8/aju8Ywn0l+2q1Rdu9TAnzSrjjFCifESZHtVNLKgON7lIAN4OMoHQ730rYRqE RVs0In4h/lPUQ/3Z0urBYHvrZiFj6C1vqQbpYr3kCW52tYh/tIRzibOQbVo/4OEyehKm i4CXFamCfkCfFANPlmOqqUz9wObgHlytlbyagn7fNmzSxmAe24UndsbcV2EDV8rKSVjE 3IcL9cGjNq7QbjJB/GXk4t9tE9NH9mM3ZAgZJjAX6bL5u+co5k0rT69TmSa0qM6NPS/h JPiRmy7KNVk+OwI7l3uIbMbdLYXLyHAJGNJOhd4oE1ntxjuIX6uD7FrI8tA16XZWfQck NmdA== X-Gm-Message-State: AOJu0YxCJxwG9mcdfCDs/MyBKv/c1Smu8zCNy7NGQ6mVcEd9g1ws3bt6 RR8gJd91x+nfGlJqs7jJLeENCevCZZENWoRcD2WHyAFCzLD7heocCRo3NmvIxEAhOFpRMA== X-Gm-Gg: ASbGncvIzK0brj1CXk29WC6elrdYsxIY3oRTIPhHNDZNa3IensEub4wqQjMCnDIF7Wo 2+b9iCpWi2tyBPMPjA14CDtlg9naGYUEwP6HbukrWPiovxHVvK2FVQg4PihtqAaZFx2CztQRYKp SCyTETesBsc96dr9epK0klfPPnx3sivbROd94ZJOpu+BVAc0GKpAWh29rVVOPsPNYLpPrChHTqt py92zL1uu1Hps/7DrLQpUlIpFePtTFjWS7l0bCZnknC2JVAXQxHdYNUm8egsTxhCUkEL3DRxE4x kD9Be+1Sd9FaXfvpc0WYPbG9UIFBmPWIW6mDk6zYqpzrGjwVHNdAopy3UVFmDadUNTIVC4qXfl7 AAQiuLt2KwEufNvAYYRkccR2s X-Google-Smtp-Source: AGHT+IFvmBWiMdWsEVmoElLoXfgpAr5UqDmLL2robWSmoiY1vejLxm9CsvaNLYMcdcjm6wWIrUDv+g== X-Received: by 2002:a17:907:6d23:b0:ac1:ea29:4e63 with SMTP id a640c23a62f3a-ad52d54495amr1674519266b.26.1747766149107; Tue, 20 May 2025 11:35:49 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH] build-aux: simplify grep detection on FreeBSD Date: Tue, 20 May 2025 20:34:03 +0200 Message-ID: <20250520183403.90170-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 23TUWF5SPLEEN4RYS7XYJ72WUTOZLL2A X-Message-ID-Hash: 23TUWF5SPLEEN4RYS7XYJ72WUTOZLL2A X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Alexey Dokuchaev X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747766174586116600 Content-Type: text/plain; charset="utf-8" From: Alexey Dokuchaev For quite some time now FreeBSD provides its own version of the grep(1) tool, and the GNU grep from the ports collection is available as ggrep(1). So remove the detection code and just request ggrep. Signed-off-by: Alexey Dokuchaev Reviewed-by: Michal Privoznik --- build-aux/meson.build | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index bcd10e89f2..56c91971cf 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -13,23 +13,10 @@ if git and tests_enabled[0] if host_machine.system() =3D=3D 'freebsd' or host_machine.system() =3D= =3D 'darwin' make_prog =3D find_program('gmake') sed_prog =3D find_program('gsed') + grep_prog =3D find_program('ggrep') else make_prog =3D find_program('make') sed_prog =3D find_program('sed') - endif - - if host_machine.system() =3D=3D 'freebsd' - grep_prog =3D find_program('grep') - grep_cmd =3D run_command(grep_prog, '--version', check: true) - if grep_cmd.stdout().startswith('grep (BSD grep') - grep_prog =3D find_program('/usr/local/bin/grep', required: false) - if not grep_prog.found() - error('GNU grep not found') - endif - endif - elif host_machine.system() =3D=3D 'darwin' - grep_prog =3D find_program('ggrep') - else grep_prog =3D find_program('grep') endif =20 --=20 2.49.0