From nobody Tue Feb 10 12:14:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673358314; cv=none; d=zohomail.com; s=zohoarc; b=VkM/fvVi3hTM3Fkh6MktcA6xLkmRmIjp524nyYDyXMOpOBTlhwSwHncx0B/JK5OQb8LoAY1dtgx/1uGGHT+jZ7tJaby+ZCFMsz6L/Pp4K183Axaa2QsXqmJtdM/Tb7S9g063seFuujA8ZgSY5OiSjE4BSaW+HTaqzBUfq1QrWC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673358314; h=Content-Type:Content-Transfer-Encoding:Cc: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=O4bcdIamR/UYLssDq4J/lT5HEewpacYug2bz0YOnVPU=; b=N4enDoB0oe/ogufcF0DAbxV5T8whFr8pEo7jJkBO7oPC3YLyiGoGOpEgzTCkIiCgbIQgwU2jqY72ideE+rlldVZkZcarfWJkAxtRII3reAWj14FVpdgMHCRDYzhPCFtwGr+108xGGgZcA749HZbidB2JVCeg9WJf9lCYZoIc2zc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673358314073113.95379109526198; Tue, 10 Jan 2023 05:45:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFEfw-0001je-J1; Tue, 10 Jan 2023 08:28:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFEfC-0001We-B9 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 08:27:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFEfA-0003gF-Mp for qemu-devel@nongnu.org; Tue, 10 Jan 2023 08:27:38 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-139-SrNo9E2fNtqUz4vUI-n7Wg-1; Tue, 10 Jan 2023 08:27:32 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC18E3811F30; Tue, 10 Jan 2023 13:27:31 +0000 (UTC) Received: from localhost (unknown [10.39.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC07B422F2; Tue, 10 Jan 2023 13:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673357256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O4bcdIamR/UYLssDq4J/lT5HEewpacYug2bz0YOnVPU=; b=Invq2DW5xrciri2RMHHvPO3LNS3BLT65JZyzepjti4bFFN2dcjB6hHQn5mmcLSvtrcwnEy vzFkV6GwibqDAFLgcYRsg6WgjcOdSqzc9A8EZ/uQ/vCqUBmkRZMJ/TkbGKa4bEOmzZvOLG zZC7N3+qPa8Mk1xECHPflMfMpczDBUk= X-MC-Unique: SrNo9E2fNtqUz4vUI-n7Wg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , John Snow , kraxel@redhat.com, Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , pbonzini@redhat.com, Eric Farman , David Hildenbrand , Wainer dos Santos Moschetta , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Richard Henderson , Cleber Rosa , thuth@redhat.com, Halil Pasic , Michael Roth , Li-Wen Hsu , qemu-s390x@nongnu.org, Christian Borntraeger , Ed Maste Subject: [PATCH v4 4/8] meson: replace Perl usage with Python Date: Tue, 10 Jan 2023 17:26:56 +0400 Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com> In-Reply-To: <20230110132700.833690-1-marcandre.lureau@redhat.com> References: <20230110132700.833690-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673358314909100001 From: Marc-Andr=C3=A9 Lureau Let's try to remove Perl usage during build time. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qapi-schema/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 9dfe98bc9a..d85b14f28c 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -259,22 +259,23 @@ if build_docs # Fix possible inconsistency in line endings in generated output and # in the golden reference (which could otherwise cause test failures # on Windows hosts). Unfortunately diff --strip-trailing-cr - # is GNU-diff only. The odd-looking perl is because we must avoid + # is GNU-diff only. The odd-looking python is because we must avoid # using an explicit '\' character in the command arguments to # a custom_target(), as Meson will unhelpfully replace it with a '/' # (https://github.com/mesonbuild/meson/issues/1564) + remove_cr =3D [python, '-c', 'import sys;[sys.stdout.write(line.replace(= chr(13), "")) for line in sys.stdin]'] qapi_doc_out_nocr =3D custom_target('QAPI rST doc newline-sanitized', output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: true, - command: ['perl', '-pe', '$x =3D chr 1= 3; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) =20 qapi_doc_ref_nocr =3D custom_target('QAPI rST doc reference newline-sani= tized', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: true, - command: ['perl', '-pe', '$x =3D chr 1= 3; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) =20 test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_o= ut_nocr[0]], --=20 2.39.0