From patchwork Sun Mar 6 04:55:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allan McRae X-Patchwork-Id: 2032 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.27) for (single-drop); Sun, 06 Mar 2022 04:55:45 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id wBEjH9A+JGK4EwUAK+/4rw (envelope-from ) for ; Sun, 06 Mar 2022 04:55:44 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 11117DAA914; Sun, 6 Mar 2022 04:55:43 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id E3FF8DA55CB; Sun, 6 Mar 2022 04:55:42 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id 6A7C7DA55C2 for ; Sun, 6 Mar 2022 04:55:41 +0000 (UTC) From: Allan McRae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1646542540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KATw+/4kuR2rG571TaIOqExwA9+uR6FKosKNfNLnCJ8=; b=O0cVy/GDdSrw2Z1bSd6hzl2zYmbRA/7/hkGOz1X9P9YVwRc1trgYePvpp61CKTvo/wcO9f D+7W9YgC0zrbKxsg4ZgzUkhQfmokUV/Q9UpSvWD2F/Ga5vEULNqNBzrZrB2QcPUvJwiXhN 9vJo8lkpl8+yaVeoqqEYZvSvUu8KVV0PRuVaG96nyqWXEaKLsmxuRxRYNlZwXhHrbUfK/7 3ZZLhAae8VdHaZf+oArJrilWFxh1AZ7r2ITeI4xgAUwI0xlWlHDso5WN8FdCNIuLOHAkH6 cp+LLC2suA8GgZ0F6OxWm7twZgTQ9noT7DwsPxScUnK0Mix0HrohGygZLnWhk0YfLKrxs3 d+dbE623QkKVQGYkp63tM638B0By1fSHBh0Y4zXQCvP+90LxGlHG3VfSx/st7yCvbNxSdl tZV1TE6bzpuPHljo6c/EmBZWIc0WvKUjZW+6JWMeymsAc154nc0a3ToMl8+wEjcAlUx16I JzBvZ/siXCZvPhWb5kwFqTnenBNMdgD2Dsfw284iTsNqZaXMgP/5NzEBvDW1K/jopbtA3f SxexZ9B2LtO/28NRfnS/oc6OJSywBiXY6qImnd8ERlEmlHtLwIHq5a0uKlxYYLRDOch85t z8XDgtWYispZYSIB7EAgbBTkJUR/wifXTd6yXjhKOJt3Ncs4Gsdow= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1646542540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KATw+/4kuR2rG571TaIOqExwA9+uR6FKosKNfNLnCJ8=; b=sLFx4XgRTZRW3biN3nOnMcxpA0oyIHm86KuUCgBAci3njcppQDuKIvTZLfqAcWIbWIfopY g9jvb3Hpsgr9wUBw== To: pacman-dev@lists.archlinux.org Subject: [PATCH] Silence meson run_command warning Date: Sun, 6 Mar 2022 14:55:31 +1000 Message-Id: <20220306045531.753495-1-allan@archlinux.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" X-Rspamd-Queue-Id: 11117DAA914 Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b="O0cVy/GD"; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=sLFx4XgR; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_IN_DNSWL_MED(-0.40)[2a01:4f9:c010:9eb4::1:from,95.216.189.61:received]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MAILLIST(-0.20)[mailman]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; DKIM_TRACE(0.00)[archlinux.org:+]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FROM_NEQ_ENVFROM(0.00)[allan@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; TO_DN_NONE(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Upsteam is warning about future change in the run_command check argument. Ref: https://github.com/mesonbuild/meson/issues/9300 Signed-off-by: Allan McRae --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 76b9d2aa..78663ff3 100644 --- a/meson.build +++ b/meson.build @@ -33,7 +33,7 @@ MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symli BASH = find_program('bash4', 'bash') if BASH.found() - bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"').stdout() + bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"', check: true).stdout() have_bash = bash_version.version_compare('>= 4.4.0') endif @@ -53,7 +53,8 @@ if get_option('use-git-version') find_program('git'), 'describe', '--abbrev=4', - '--dirty').stdout().strip().strip('v') + '--dirty', + check: true).stdout().strip().strip('v') else PACKAGE_VERSION = meson.project_version() endif @@ -230,7 +231,7 @@ strip_static = '--strip-debug' file_seccomp = get_option('file-seccomp') # meson-git has find_program('file', required: false, version: '>=5.38') -filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"').stdout() +filever = run_command('sh', '-c', 'file --version | sed -n "s/^file-\(.*\)/\\1/p"', check: true).stdout() if file_seccomp.enabled() or ( file_seccomp.auto() and filever.version_compare('>= 5.38') ) filecmd = 'file -S' endif @@ -245,7 +246,7 @@ elif os.contains('bsd') or os == 'dragonfly' inodecmd = 'stat -f \'%i %N\'' endif -chost = run_command(cc, '-dumpmachine').stdout().strip() +chost = run_command(cc, '-dumpmachine', check: true).stdout().strip() carch = chost.split('-')[0] # annoyingly, we have to maintain two sets of configuration_data which is