From nobody Wed Nov 19 07:04:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615373465; cv=none; d=zohomail.com; s=zohoarc; b=V3WT8PVQHRPdkcI7iLzwjvbnwI5Njq8wKjEuZnl6nGQl6HPs7JH53+CTXhEAt0IqZ+dJx7svtTqPMEgmwRc76OUC3b+YR8+Q383D7+jWKNci5Pegy6VocHP9UmecIA+Z7dqohOjRScZXL4Caay9wY1qNkuyzxnINWsrQL0wvaw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615373465; h=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=vmlbfjIORtFM9ouDG6TC7+H2AhddDKhJKH+zFhlyOCk=; b=DFgQGSBwOdcgcYmzO84nI9+/kwkXjsf4GyjtMY3hSMmTi9QIUpxxWHl/xoso8TMCDdgsEDDZt5Dw0oqXC7GCk8qNQFrUAz89+Iqy5YfC/h5ICEXi4cs/X4DTBqvJti32ukW7tTQtOoXNztgP1orWAcFNV9fhP5BRfVPR55ZMJFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161537346591133.214916530195524; Wed, 10 Mar 2021 02:51:05 -0800 (PST) Received: from localhost ([::1]:49006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwQi-0005Er-Pb for importer@patchew.org; Wed, 10 Mar 2021 05:51:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwPO-0003uT-PD for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:42 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJwPN-0003kN-6l for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:42 -0500 Received: by mail-wm1-x32f.google.com with SMTP id c76-20020a1c9a4f0000b029010c94499aedso10709797wme.0 for ; Wed, 10 Mar 2021 02:49:40 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s11sm9060808wme.22.2021.03.10.02.49.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 02:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vmlbfjIORtFM9ouDG6TC7+H2AhddDKhJKH+zFhlyOCk=; b=j29rPl5rWRUhrLws68j3T9C0red/zSlMR0o0e5wrd1tbGE6eHAb1LB6op4LP6RPA+u un/++wD7+jjbeerSFU6JNvjiIGIIogzNOqlAMvV6xpT50NuoWFsyNP3ocHSho0gZTNzV wu6cBuzar105JyTDhcsi8Xx4I7/jfVcGVXg1Dzc6M5HOZG5RQU5d2pduKqlqmOc2nFzq cEhqKm4mCuKMD57TBFncfpqDwgCHQol0Gb+vlJ+Ftodph1vRhDNtSSrWjTYoDZYAJhaL bqqxS028GhxwyfW+p6vQxaU6KrZ14OZ1LnZZEGwus+POsMx/jC/QdosVLyLw523DZv9p y1vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vmlbfjIORtFM9ouDG6TC7+H2AhddDKhJKH+zFhlyOCk=; b=YcJ/TdGrS8Cp2QAyvF1T0Fxo22Sho52JHQiqnJeDnR9AZXc/zwNr0XFFbecff7Le+R WeSPxq3hLHrpNytFDR4APeag24LxrOu3JFNVFhxFwfEp+r2wizkF6VghKA1XKWKAlzH2 1KzLNkoUvP4zvI2erxG00IS7p2Ew1MBq7QukIv7ApH5wEtL+z464ZZpteBKvrNmXumNk 91JSlVsxImQSGFbXHsjQI2o7sE+ZDLCqYtUVp/7WinAUhnstqnFB0ZOpjrF7AuQSx6eG rNi8VJy89wSawxrewlqnUYKT1ghjq8cuaPGMWukfQNNq3fROQim3u3dtooqhPzz0zGlz qYrg== X-Gm-Message-State: AOAM531idq6iCg5u0AkhpCT/LYQR114XZOgyknZlAesT9I1TC6GiuOxt GlqDJH7MfIbfjdVqGs6DXhPfx4jo7Ow= X-Google-Smtp-Source: ABdhPJzVCYW2VRmUfgNCFcQfKGhKT0WKQxKjGJpUAGuCz1CSjSaQghf4vBkT8XPLbj8T1HQJ2slrTA== X-Received: by 2002:a7b:c308:: with SMTP id k8mr2718090wmj.54.1615373380007; Wed, 10 Mar 2021 02:49:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hexagon: do not specify Python scripts as inputs Date: Wed, 10 Mar 2021 11:49:34 +0100 Message-Id: <20210310104937.253532-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310104937.253532-1-pbonzini@redhat.com> References: <20210310104937.253532-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Python scripts are not inputs, and putting them in @INPUT@. This puts requirements on the command line format, keeping all inputs close to the name of the script. Avoid that by not including the script in the command and not in the inputs. Also wrap "PYTHONPATH" usage with "env", since setting the environment this way is not valid under Windows. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/hexagon/meson.build | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index 5dd68907b1..bb0b4fb621 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -53,90 +53,81 @@ hexagon_ss.add(semantics_generated) shortcode_generated =3D custom_target( 'shortcode_generated.h.inc', output: 'shortcode_generated.h.inc', - input: 'gen_shortcode.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_shortcode.py'), semantics_generated, attr= ibs_def, '@OUTPUT@'], ) hexagon_ss.add(shortcode_generated) =20 helper_protos_generated =3D custom_target( 'helper_protos_generated.h.inc', output: 'helper_protos_generated.h.inc', - input: 'gen_helper_protos.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_helper_protos.py'), semantics_generated, = attribs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(helper_protos_generated) =20 tcg_funcs_generated =3D custom_target( 'tcg_funcs_generated.c.inc', output: 'tcg_funcs_generated.c.inc', - input: 'gen_tcg_funcs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_tcg_funcs.py'), semantics_generated, attr= ibs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(tcg_funcs_generated) =20 tcg_func_table_generated =3D custom_target( 'tcg_func_table_generated.c.inc', output: 'tcg_func_table_generated.c.inc', - input: 'gen_tcg_func_table.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_tcg_func_table.py'), semantics_generated,= attribs_def, '@OUTPUT@'], ) hexagon_ss.add(tcg_func_table_generated) =20 helper_funcs_generated =3D custom_target( 'helper_funcs_generated.c.inc', output: 'helper_funcs_generated.c.inc', - input: 'gen_helper_funcs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def, gen_tcg_h], - command: [python, '@INPUT@', semantics_generated, attribs_def, gen_tcg= _h, '@OUTPUT@'], + command: [python, files('gen_helper_funcs.py'), semantics_generated, a= ttribs_def, gen_tcg_h, '@OUTPUT@'], ) hexagon_ss.add(helper_funcs_generated) =20 printinsn_generated =3D custom_target( 'printinsn_generated.h.inc', output: 'printinsn_generated.h.inc', - input: 'gen_printinsn.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_printinsn.py'), semantics_generated, attr= ibs_def, '@OUTPUT@'], ) hexagon_ss.add(printinsn_generated) =20 op_regs_generated =3D custom_target( 'op_regs_generated.h.inc', output: 'op_regs_generated.h.inc', - input: 'gen_op_regs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_op_regs.py'), semantics_generated, attrib= s_def, '@OUTPUT@'], ) hexagon_ss.add(op_regs_generated) =20 op_attribs_generated =3D custom_target( 'op_attribs_generated.h.inc', output: 'op_attribs_generated.h.inc', - input: 'gen_op_attribs.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_op_attribs.py'), semantics_generated, att= ribs_def, '@OUTPUT@'], ) hexagon_ss.add(op_attribs_generated) =20 opcodes_def_generated =3D custom_target( 'opcodes_def_generated.h.inc', output: 'opcodes_def_generated.h.inc', - input: 'gen_opcodes_def.py', depends: [semantics_generated], depend_files: [hex_common_py, attribs_def], - command: [python, '@INPUT@', semantics_generated, attribs_def, '@OUTPU= T@'], + command: [python, files('gen_opcodes_def.py'), semantics_generated, at= tribs_def, '@OUTPUT@'], ) hexagon_ss.add(opcodes_def_generated) =20 @@ -164,9 +155,8 @@ hexagon_ss.add(iset_py) dectree_generated =3D custom_target( 'dectree_generated.h.inc', output: 'dectree_generated.h.inc', - input: 'dectree.py', depends: [iset_py], - command: ['PYTHONPATH=3D' + meson.current_build_dir(), '@INPUT@', '@OU= TPUT@'], + command: ['env', 'PYTHONPATH=3D' + meson.current_build_dir(), files('d= ectree.py'), '@OUTPUT@'], ) hexagon_ss.add(dectree_generated) =20 --=20 2.29.2 From nobody Wed Nov 19 07:04:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615373566; cv=none; d=zohomail.com; s=zohoarc; b=n0VzG6niAVRyUqY9NaJQuyZ8pknbA9Q38tCsJxj+WG7SKIyCfLz4V8nqnLvc5qVag8JtOF2Inf9iY13k65n2iBy/+TrUgnqrnRWw9zoAfISo4ac7ssnKMQxnbFdw04TkkYbWdR2eL1vbtH/9TudAYDQS+k/wZagwXE8krgEBoHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615373566; h=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=2fdnCYcGz/rNz0f0M+8dUoADYZZ+wtTRYedFfAAe2jw=; b=STB+KHAT3YyGYtpvFpOr4aeqx+r6i6vcAEhpgXoMEplyuJjzahCyGmm1LWiTcu4Q0mKYYEqC+t17xuxouelO0HXZFLiuU0WeFVRwJlrxQqe8ZbxJriB3A4WkaM6A/9LVeOSWoEQneJ9ajWQ8kdcF/aI89zlLO6MxMyz2fHjLleM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615373566925274.36051699314044; Wed, 10 Mar 2021 02:52:46 -0800 (PST) Received: from localhost ([::1]:54668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwSL-0007o0-U3 for importer@patchew.org; Wed, 10 Mar 2021 05:52:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwPP-0003ue-RI for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:43 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:33490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJwPN-0003ki-LU for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:43 -0500 Received: by mail-wm1-x32b.google.com with SMTP id w203-20020a1c49d40000b029010c706d0642so1445414wma.0 for ; Wed, 10 Mar 2021 02:49:41 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s11sm9060808wme.22.2021.03.10.02.49.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 02:49:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2fdnCYcGz/rNz0f0M+8dUoADYZZ+wtTRYedFfAAe2jw=; b=jFwrzPwQhOC8f102XAFqiS+gkUbiwME3c/OtjNbBttpIvjClburZA47oeKXUZhX8/U jcNWrKwO9IbUNjDOugKXGmjTcgN8KBHP6bkDdIRkwUigwOTlFcf49OUktXb8w3y8j83z 1J9Drw2+8UuiUtb+xFqrr3yqbKn1FemXJmzVHd5kWJI5qLraQot11a5bZUPbR7K3ydIf hSPs3jOGbF00BJOD2toEsQagQVblZDXlBKDBx9ncY6lAS/sS1rYflHFgKBqMEmfXGt+P NWEayZDEnUwFC/GxO1xu4XwHyaPtWJqLQSdIdcMI7/cos6714lpM20oPCinhOnfSnb0B VyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2fdnCYcGz/rNz0f0M+8dUoADYZZ+wtTRYedFfAAe2jw=; b=jGj4kzTYIn/vWfV2GbKZLwU355JIPwcj/6St65cG7ev7hOTTlKE4YHCVt0BiUNGOqt QHHOMVNltbgOnT+FzGdQnKz+eB+RxBbRNdAvmxWGdb9+sKd1WbjltB1W3HvJWrlTDAbz toN0nv16uKlXKZr01BMeqlta1EIP0EC385WrxSwizZpjEaXurtEDo8NPUUF6SW6w2fBa 1NnB9QcGx4Ey8WkiVtkJ/OOmA0mIeWf15sAwoCIcUr1oWOB6D5QT25zlYGmu/Lx3mWpY PW3Md/oQefeQS7zk9a4M3c5COPpjT5oh1zoC6sSb+pDHGY89XgNYWFGqSpxDo4gsc2F/ jSxg== X-Gm-Message-State: AOAM530+2mYihG5wrtOltUSul4n9pnNA4IWG3G+rSxuMoQ4dlQN19eGn Sabtz/rLK17ni+py7o4XeMgLJ8CN43E= X-Google-Smtp-Source: ABdhPJyPuBdeuNrMohXxzVpdrrDBu5+2U3AxXf191RnnvgKg9WvAtZA/Ncn1AA4xLPhx6LabHHN6GA== X-Received: by 2002:a1c:600a:: with SMTP id u10mr2096250wmb.139.1615373380546; Wed, 10 Mar 2021 02:49:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/4] meson: bump submodule to 0.57.1 Date: Wed, 10 Mar 2021 11:49:35 +0100 Message-Id: <20210310104937.253532-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310104937.253532-1-pbonzini@redhat.com> References: <20210310104937.253532-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The main advantage of 0.57 is that it fixes https://github.com/mesonbuild/meson/pull/7900, thus avoiding unnecessary rebuilds after running meson. Signed-off-by: Paolo Bonzini --- meson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson b/meson index 776acd2a80..7182685b22 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit 7182685b2241e88340b6c3340afba59a26be213f --=20 2.29.2 From nobody Wed Nov 19 07:04:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615373471; cv=none; d=zohomail.com; s=zohoarc; b=SDEhokEcbqC/VlAH1zZ9bB+e632wVnTjBfZC9KtThob33Gk46wACfWnTvh2s9RjJ+pFdA5bh8tKABpu+Coajgyc2TUkh7As0psh74cI66aEiE/NKCMoUlp3eT1NZgahjtqptec3tCQAkWD60yAPx38IhbymOl1KfUiu/rTHfgNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615373471; 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=8aIi9JEi52GeymGLHsSl0KqKUj727bZKUwmsTmAeWbE=; b=kMusQg56l7WBdO0V8tvbYaZfVeHyCa94Oj6RBqnjWfu9MOf+ZKHESynG7KwLVgM6ug4IkaHqjOApM5dD3o1qvBRpsRxdrBKzmenX8fgp6X3G+myafTO8mLJZ/tW4h45RPhRuXQPcOVVduyl4uQ/gQYSFPYPvrnrf+kQU5kt+qaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615373471597961.9091721244708; Wed, 10 Mar 2021 02:51:11 -0800 (PST) Received: from localhost ([::1]:49282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwQo-0005LX-Ak for importer@patchew.org; Wed, 10 Mar 2021 05:51:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwPQ-0003w8-KD for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:44 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:46737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJwPO-0003lf-Fr for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:44 -0500 Received: by mail-wm1-x333.google.com with SMTP id d139-20020a1c1d910000b029010b895cb6f2so10407500wmd.5 for ; Wed, 10 Mar 2021 02:49:42 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s11sm9060808wme.22.2021.03.10.02.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 02:49:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8aIi9JEi52GeymGLHsSl0KqKUj727bZKUwmsTmAeWbE=; b=DRx8TbHh/RbkAihyMWmZiodqvNbyqJfpBWmIzphoV5yDmb3cgjsge99xyIzbf9tFoK h6r7tYl/W0Icf9A0xMzuTEGsYOxzdsDxTp+EOsvi9etvpvO+LzVtPzlqOuz+zP/2g04J UmS8Co+A3m0N6+IhEwQusgsp9t5X9D7gTzSVv8NslyZimhz8Mb16G6LMVXO8yz9IZXrx W8CzYlYbeXJZmzakJ0gH7IsWIrdJ77ydbYclH/1YrQMBKdfSjiIPDhXJoigbHPNJ/D4T E2rga6x/vTnT5riEBg4vZ4n8C9Jf+bW7t2XPpHuvDek6/zR5ity8Vb7e6y9eRGv1FDWV ZTAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8aIi9JEi52GeymGLHsSl0KqKUj727bZKUwmsTmAeWbE=; b=ebE9G6XyG5aBsTkRbp6pGxQEA/i4k0Y/GsabAhUDTX6sAHqi0iN7Ldkpnx0CmJHuK4 62426hC7dQfRX/+/7InPs77rqtQ9F2txRudW13C/cHLm4uBSWrmU1hr+Z7AQAtpHej4P iNor3UYgS1Si9terL2IS4vnwjf7IGxtFl4/QzZgswC9YDqZp0Sd+v4dJneARcjhUlaW/ H262I5Ry6sJlgAyDafZFaRbDcN7ibSQSotePRBs8yXWOLq42k1VDnqbW3ZRNPNgEgPMc bjZybJRARfO/Jh4acd1JHTNqsPNZib/w5NzqAhGscBrb7T0FX/WzOk8MuOhSb2nav2NV y4wA== X-Gm-Message-State: AOAM530GEfBxS1uy7Lb1YfsFQbnBBUVhPUw73fe+I5qJmieooFIsiaLt XgWvwVxx6Tqyho2QFSpGMkt1eqiyfN8= X-Google-Smtp-Source: ABdhPJzfw4Xm/nNBpt4ZNYAOFFtwf5s591NmR2FkabNS4GoWN0EnyDXhZTr3K7+dPUfS2v7kDutfgQ== X-Received: by 2002:a7b:c0c7:: with SMTP id s7mr2755189wmh.5.1615373381251; Wed, 10 Mar 2021 02:49:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/4] meson: switch minimum meson version to 0.57.0 Date: Wed, 10 Mar 2021 11:49:36 +0100 Message-Id: <20210310104937.253532-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310104937.253532-1-pbonzini@redhat.com> References: <20210310104937.253532-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Meson 0.57.0 does not need b_staticpic=3D$pie anymore, and has stabilized the keyval module. Remove the workaround and use a few replacements for features deprecated in the 0.57.0 release cycle. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 7 +---- docs/meson.build | 12 ++++---- meson.build | 54 ++++++++++++++++------------------- plugins/meson.build | 4 +-- tests/meson.build | 2 +- tests/qapi-schema/meson.build | 4 +-- tests/qtest/meson.build | 2 +- trace/meson.build | 4 +-- 8 files changed, 40 insertions(+), 49 deletions(-) diff --git a/configure b/configure index 34fccaa2ba..899922ca47 100755 --- a/configure +++ b/configure @@ -1945,7 +1945,7 @@ python_version=3D$($python -c 'import sys; print("%d.= %d.%d" % (sys.version_info[0] python=3D"$python -B" =20 if test -z "$meson"; then - if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.55.3; then + if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.57.0; then meson=3Dmeson elif test $git_submodules_action !=3D 'ignore' ; then meson=3Dgit @@ -6384,10 +6384,6 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -unset staticpic -if ! version_ge "$($meson --version)" 0.56.0; then - staticpic=3D$(if test "$pie" =3D yes; then echo true; else echo false; f= i) -fi NINJA=3D$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ @@ -6407,7 +6403,6 @@ NINJA=3D$ninja $meson setup \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ - ${staticpic:+-Db_staticpic=3D$staticpic} \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Db_lto=3D$lto -Dcfi=3D$cfi -Dcfi_debug=3D$cfi_debug \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim -Dsparse=3D$sparse= \ diff --git a/docs/meson.build b/docs/meson.build index f84306ba7e..0aa98719af 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -38,12 +38,12 @@ endif if build_docs SPHINX_ARGS +=3D ['-Dversion=3D' + meson.project_version(), '-Drelease= =3D' + config_host['PKGVERSION']] =20 - sphinx_extn_depends =3D [ meson.source_root() / 'docs/sphinx/depfile.py', - meson.source_root() / 'docs/sphinx/hxtool.py', - meson.source_root() / 'docs/sphinx/kerneldoc.py', - meson.source_root() / 'docs/sphinx/kernellog.py', - meson.source_root() / 'docs/sphinx/qapidoc.py', - meson.source_root() / 'docs/sphinx/qmp_lexer.py', + sphinx_extn_depends =3D [ meson.current_source_dir() / 'sphinx/depfile.p= y', + meson.current_source_dir() / 'sphinx/hxtool.py', + meson.current_source_dir() / 'sphinx/kerneldoc.p= y', + meson.current_source_dir() / 'sphinx/kernellog.p= y', + meson.current_source_dir() / 'sphinx/qapidoc.py', + meson.current_source_dir() / 'sphinx/qmp_lexer.p= y', qapi_gen_depends ] =20 have_ga =3D have_tools and config_host.has_key('CONFIG_GUEST_AGENT') diff --git a/meson.build b/meson.build index adeec153d9..9e2a3242ca 100644 --- a/meson.build +++ b/meson.build @@ -1,14 +1,10 @@ -project('qemu', ['c'], meson_version: '>=3D0.55.0', - default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto'] + - (meson.version().version_compare('>=3D0.56.0') ? = [ 'b_staticpic=3Dfalse' ] : []), - version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) +project('qemu', ['c'], meson_version: '>=3D0.57.0', + default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto', + 'b_staticpic=3Dfalse'], + version: files('VERSION')) =20 not_found =3D dependency('', required: false) -if meson.version().version_compare('>=3D0.56.0') - keyval =3D import('keyval') -else - keyval =3D import('unstable-keyval') -endif +keyval =3D import('keyval') ss =3D import('sourceset') fs =3D import('fs') =20 @@ -1646,21 +1642,21 @@ genh +=3D configure_file(output: 'config-host.h', c= onfiguration: config_host_data) hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') qapi_gen =3D find_program('scripts/qapi-gen.py') -qapi_gen_depends =3D [ meson.source_root() / 'scripts/qapi/__init__.py', - meson.source_root() / 'scripts/qapi/commands.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi/error.py', - meson.source_root() / 'scripts/qapi/events.py', - meson.source_root() / 'scripts/qapi/expr.py', - meson.source_root() / 'scripts/qapi/gen.py', - meson.source_root() / 'scripts/qapi/introspect.py', - meson.source_root() / 'scripts/qapi/parser.py', - meson.source_root() / 'scripts/qapi/schema.py', - meson.source_root() / 'scripts/qapi/source.py', - meson.source_root() / 'scripts/qapi/types.py', - meson.source_root() / 'scripts/qapi/visit.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi-gen.py' +qapi_gen_depends =3D [ meson.current_source_dir() / 'scripts/qapi/__init__= .py', + meson.current_source_dir() / 'scripts/qapi/commands.p= y', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi/error.py', + meson.current_source_dir() / 'scripts/qapi/events.py', + meson.current_source_dir() / 'scripts/qapi/expr.py', + meson.current_source_dir() / 'scripts/qapi/gen.py', + meson.current_source_dir() / 'scripts/qapi/introspect= .py', + meson.current_source_dir() / 'scripts/qapi/parser.py', + meson.current_source_dir() / 'scripts/qapi/schema.py', + meson.current_source_dir() / 'scripts/qapi/source.py', + meson.current_source_dir() / 'scripts/qapi/types.py', + meson.current_source_dir() / 'scripts/qapi/visit.py', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi-gen.py' ] =20 tracetool =3D [ @@ -2204,14 +2200,14 @@ foreach target : target_dirs if target.endswith('-softmmu') execs =3D [{ 'name': 'qemu-system-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': files('softmmu/main.c'), 'dependencies': [] }] if targetos =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', - 'gui': true, + 'win_subsystem': 'windows', 'sources': files('softmmu/main.c'), 'dependencies': [] }] @@ -2220,7 +2216,7 @@ foreach target : target_dirs specific_fuzz =3D specific_fuzz_ss.apply(config_target, strict: fals= e) execs +=3D [{ 'name': 'qemu-fuzz-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': specific_fuzz.sources(), 'dependencies': specific_fuzz.dependencies(), }] @@ -2228,7 +2224,7 @@ foreach target : target_dirs else execs =3D [{ 'name': 'qemu-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': [], 'dependencies': [] }] @@ -2248,7 +2244,7 @@ foreach target : target_dirs link_language: link_language, link_depends: [block_syms, qemu_syms] + exe.get('link_depen= ds', []), link_args: link_args, - gui_app: exe['gui']) + win_subsystem: exe['win_subsystem']) =20 if exe_sign emulators +=3D {exe['name'] : custom_target(exe['name'], diff --git a/plugins/meson.build b/plugins/meson.build index e77723010e..d58efc980e 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,7 +1,7 @@ if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.build_root() / 'qem= u-plugins-ld.symbols')] + plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.project_build_root(= ) / 'qemu-plugins-ld.symbols')] elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host - plugin_ldflags =3D ['-Wl,-exported_symbols_list,' + (meson.build_root() = / 'qemu-plugins-ld64.symbols')] + plugin_ldflags =3D ['-Wl,-exported_symbols_list,' + (meson.project_build= _root() / 'qemu-plugins-ld64.symbols')] else plugin_ldflags =3D [] endif diff --git a/tests/meson.build b/tests/meson.build index 656d211e25..c45f5e2275 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -112,7 +112,7 @@ tests =3D { 'test-keyval': [testqapi], 'test-logging': [], 'test-uuid': [], - 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/pt= imer.c'], + 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw= /core/ptimer.c'], 'test-qapi-util': [], } =20 diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 304ef939bd..26588396d2 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -1,5 +1,5 @@ test_env =3D environment() -test_env.set('PYTHONPATH', meson.source_root() / 'scripts') +test_env.set('PYTHONPATH', meson.project_source_root() / 'scripts') test_env.set('PYTHONIOENCODING', 'utf-8') =20 schemas =3D [ @@ -240,7 +240,7 @@ if build_docs # clutter up the build dir with the cache. command: [SPHINX_ARGS, '-b', 'text', '-E', - '-c', meson.source_root() / 'docs= ', + '-c', meson.project_source_root()= / 'docs', '-D', 'master_doc=3Ddoc-good', meson.current_source_dir(), meson.current_build_dir()]) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 58efc46144..eb254341eb 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -260,7 +260,7 @@ foreach dir : target_dirs qtest_env.set('QTEST_QEMU_IMG', './qemu-img') test_deps +=3D [qemu_img] endif - qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vm= state-daemon.sh') + qtest_env.set('G_TEST_DBUS_DAEMON', meson.project_source_root() / 'tests= /dbus-vmstate-daemon.sh') qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base) =20 foreach test : target_qtests diff --git a/trace/meson.build b/trace/meson.build index 08f83a15c3..317b557915 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -3,7 +3,7 @@ specific_ss.add(files('control-target.c')) =20 trace_events_files =3D [] foreach dir : [ '.' ] + trace_events_subdirs - trace_events_file =3D meson.source_root() / dir / 'trace-events' + trace_events_file =3D meson.project_source_root() / dir / 'trace-events' trace_events_files +=3D [ trace_events_file ] group_name =3D dir =3D=3D '.' ? 'root' : dir.underscorify() group =3D '--group=3D' + group_name @@ -69,7 +69,7 @@ foreach d : [ ] gen =3D custom_target(d[0], output: d[0], - input: meson.source_root() / 'trace-events', + input: meson.project_source_root() / 'trace-events', command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@', '@OUTPUT@' ], depend_files: tracetool_depends) specific_ss.add(when: 'CONFIG_TCG', if_true: gen) --=20 2.29.2 From nobody Wed Nov 19 07:04:18 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615373565; cv=none; d=zohomail.com; s=zohoarc; b=TsSu2Ivas+3E8+hT3JOmNUi+JwOsYZEOXIMcKnX4sPWmJR5kIlLd1calVSI/3eSGu+TnfyuqBFSxtk1kRhlwkgGck76jdiHnaQsVk55hj3pPH1Tx/xbOaixFTQz2Ehm82eITysqr7Gv92qq+hCV4SEHLcDSFgZ6ForZkuzqkxJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615373565; h=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=YhBo1ZSoIBwZQ5KKbNpd+bGBZNvKDhx/Uj/CIpS1xWc=; b=RvGLkQWwjq1mgKd8tIixB4Umiv4LIKlVVB8STH28nfRHxpyL9PVRi1nbei1dZCgLaTuMyfVZhfeB6pevG9zUEYv7tIUFBJmHC310M/I3fMufg4ScEjTZU5bywQHXthvi7ZNHAjqnUikxnWPCBYG0FAcxr3GDPnP2vISF7t6+Qco= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615373565914177.12457688758752; Wed, 10 Mar 2021 02:52:45 -0800 (PST) Received: from localhost ([::1]:54596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwSK-0007mC-UF for importer@patchew.org; Wed, 10 Mar 2021 05:52:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwPQ-0003vd-E6 for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:44 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJwPO-0003lh-WF for qemu-devel@nongnu.org; Wed, 10 Mar 2021 05:49:44 -0500 Received: by mail-wm1-x330.google.com with SMTP id f22-20020a7bc8d60000b029010c024a1407so10723232wml.2 for ; Wed, 10 Mar 2021 02:49:42 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s11sm9060808wme.22.2021.03.10.02.49.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 02:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YhBo1ZSoIBwZQ5KKbNpd+bGBZNvKDhx/Uj/CIpS1xWc=; b=bCrgZCxeii031vCKUZxH/XL9c/zKCMM24Rhg07B765uxrd//6J/Qiq9yzYZPz+J9Tg PWrahUCEFV3WGP93MKKnAovwULXMixW+nAlxGpESgUZZF5hSs0jjEco7a3nT0lG0zPaT OKFgi6pESRDmWymGbXOrlRyBsg+qeFatrj0wXBEbrz0RnXQZ0hVIG0PS+BH1DS1L4vT1 1wOO6gZBB5jdSbBNKstLbnsO8yop7xha19E/c1pyE1RFrXmju+hyX2G+h+Vc1+w/zKPp OioJzTgRjgmpg8ayoskNzKjz6RyUK7fpIW70lIL7w/JhrIL2FywK5mnXVPO7MlIlKasE tbbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YhBo1ZSoIBwZQ5KKbNpd+bGBZNvKDhx/Uj/CIpS1xWc=; b=IoylaMXbh1J8XTeGB/DAq5HuIPliobYDRQ9Kx/ZsfW1PpplGeI0bOFXie1/+1DYzGM uwKedaq3wHXoDtWgdEKcdcLSJ+k9LOC5nTXrWHgenNLQf+SwjKtuqJ9ho/hCbfxVxQ56 Y3f5IIkTJVVuIZxVUBidDBGqPZhBtzGYIVwrL740HwUPBUpJh2WP8emSDdEs1QlfWvwz VQb7f0sdpETn2KNlIqsc5Um2WTdQ7s15ifX7gsgZi8tDhlZrWXDekpHkEdDqrJC1P4B3 YRB5ms/b+bpDhGJU/4Tj7sOqu9uoS3jrxrDCBOsNKjc/+THn3Pyy70hIHmahCcUam6p6 Gpsg== X-Gm-Message-State: AOAM533Q5bdMPe8rhodf9sGapNA1qXSUJCLl2nyY0/Fj5r2F58/kN4eg 6dHJL+vmlLol3xiyhqLn/hEPLcW1hTM= X-Google-Smtp-Source: ABdhPJwF56Zt0kX2hxpER6h+6X3U9+0rBeeUJKqDZQiJ7T5XmP0N4hPOxJwk14eqAky1c1cmy9OQOg== X-Received: by 2002:a1c:f701:: with SMTP id v1mr2741186wmh.182.1615373381780; Wed, 10 Mar 2021 02:49:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/4] hexagon: use env keyword argument to pass PYTHONPATH Date: Wed, 10 Mar 2021 11:49:37 +0100 Message-Id: <20210310104937.253532-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310104937.253532-1-pbonzini@redhat.com> References: <20210310104937.253532-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This feature is new in meson 0.57 and allows getting rid of the "env" wrapp= er. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- target/hexagon/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index bb0b4fb621..aaeee11ac1 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -156,7 +156,8 @@ dectree_generated =3D custom_target( 'dectree_generated.h.inc', output: 'dectree_generated.h.inc', depends: [iset_py], - command: ['env', 'PYTHONPATH=3D' + meson.current_build_dir(), files('d= ectree.py'), '@OUTPUT@'], + env: {'PYTHONPATH': meson.current_build_dir()}, + command: [python, files('dectree.py'), '@OUTPUT@'], ) hexagon_ss.add(dectree_generated) =20 --=20 2.29.2