From nobody Tue May 21 00:58:41 2024 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=1615744318; cv=none; d=zohomail.com; s=zohoarc; b=i1hRMBMhsJC38TZWPnLaKM99A3s4Y/I5dgUq+sBtMvS5571zp+W2w071vR/MwjSk6yY96Mp72ZaCMgGUMPIHEQI7+MAxHfkhwC8NjMR3SaiatAP7ufgcoksVyjLfmSt6rx13qW27znJX+1VBkeG4if2TOVg90eFI+GORhuh9Lzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615744318; 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=ROvDIv+xkeg8KzSTHDshfuJ8iLFDFQ5jv8EnC07Y4kk=; b=DBQnbiKiFlete9eSSphWfcwrs7acr5Ge3R0vn3TIGbrwGEbeEimAgJBTgprpWfWyajlNQs19If1FG4b93RFG2lBvP2LzvhnsYjll/LQAMqX0H8mWdlWHe5RYDbgXsRboV574kneAFFc2yz5WpPTHRIRbsZZwgDdBQhLQ3GbsGNM= 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 161574431802567.4502759866275; Sun, 14 Mar 2021 10:51:58 -0700 (PDT) Received: from localhost ([::1]:55184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLUuC-000623-UA for importer@patchew.org; Sun, 14 Mar 2021 13:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLUsp-0004Mw-E8 for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:31 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLUsn-0006eM-Jh for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:31 -0400 Received: by mail-wr1-x433.google.com with SMTP id v4so4548969wrp.13 for ; Sun, 14 Mar 2021 10:50:28 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a6sm11442749wmm.0.2021.03.14.10.50.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 10:50:27 -0700 (PDT) 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=ROvDIv+xkeg8KzSTHDshfuJ8iLFDFQ5jv8EnC07Y4kk=; b=IuLkIn0JhTghdmmeUEOKjuN63ElyClgE5Yv/KkuLXa+3QJ7ODsYqF2iFaqhViw0yWv LgtSj9LxiZKUJe5e900cB4GoSv4N11+RNfLcaKtl51sx92bChN1suEK/BBrhSGtvOxiN 1E1/k1zB3QMN6PKJHmdrcOjMkB4KWReaeFssEW0K4zOqdtgmPutBbtuyu8oD5E2+73R/ 0SIb297u6xaPjsU4paNV7h6MrHcHplwwRWmNk4iOxYKgI5QbJfc70wP65kO7HXPdlOuN OXgpLzqWJwFDE7wRLuPP6TeGqx2fcLCtqH9ZxxiKdXznU+T0Pw0wyra3G3ttdXoe3jdA 9hUw== 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=ROvDIv+xkeg8KzSTHDshfuJ8iLFDFQ5jv8EnC07Y4kk=; b=TRM72kMlbScAHI+QXH1pnrwxQzrFsoGMv3LweUYGMShcS5GAqty8VoPhWQiFfXL2rQ gxiiJJb7pkD+43Z3SS/XkJlNmiIXIplIbjkIUJRzGuMecf4ua0FeE36AsAeqUer5W79y HfOVJbDb6oi4IM+AbtGmW4GY3PiFSEp+RQG7KU+3eo9GjM3MzuuVY32Jb/64wyZvFxn6 q6veRiprISu8Sc/efE7d+J7ElyiV+iSt6D/+3wmZuFfnns6T5YrdfemKM7nHwzI6fKFz AsS4vjxgoxWih0NHDF1tuKc1phvW20P8vrkxJcmf+/AGT2NhDKRxeKhFXux0fMJIMChK n7OA== X-Gm-Message-State: AOAM53268MeXQGweWbE7ovyuXA7dvc57wBKGKN59VjAUrv4jHBUJdDoE HcHEdudlY2D9lgLh8u63HgCdVU1BJIE= X-Google-Smtp-Source: ABdhPJxcKClG/gxIDxJpj0clOI8MQcDxpWwGMQ8kOlIWWVQrDrAPNj/owwHv1HrB8tYJaPwPPYtUmQ== X-Received: by 2002:a5d:42cb:: with SMTP id t11mr23579805wrr.280.1615744227663; Sun, 14 Mar 2021 10:50:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/5] hexagon: do not specify executables as inputs Date: Sun, 14 Mar 2021 18:50:21 +0100 Message-Id: <20210314175025.114723-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210314175025.114723-1-pbonzini@redhat.com> References: <20210314175025.114723-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::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.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" gen_semantics is an executable, not an input. Meson 0.57 special cases the first argument and @INPUT@ is not expanded there. Fix that by not including it in the input, only in the command. Signed-off-by: Paolo Bonzini --- target/hexagon/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index 15318a6fa7..5dd68907b1 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -33,8 +33,7 @@ gen_semantics =3D executable( semantics_generated =3D custom_target( 'semantics_generated.pyinc', output: 'semantics_generated.pyinc', - input: gen_semantics, - command: ['@INPUT@', '@OUTPUT@'], + command: [gen_semantics, '@OUTPUT@'], ) hexagon_ss.add(semantics_generated) =20 @@ -154,8 +153,7 @@ gen_dectree_import =3D executable( iset_py =3D custom_target( 'iset.py', output: 'iset.py', - input: gen_dectree_import, - command: ['@INPUT@', '@OUTPUT@'], + command: [gen_dectree_import, '@OUTPUT@'], ) hexagon_ss.add(iset_py) =20 --=20 2.29.2 From nobody Tue May 21 00:58:41 2024 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=1615744319; cv=none; d=zohomail.com; s=zohoarc; b=Oewk3+SRwBhzx2pSUhc7fhDxAjrhFHcYhiLU2nzXa0Js+go5WH4vT8rQqToxG4MhPPMVojTwH4mXvhrOJeNg0l3UILPTyaCiWUf4qFiN1kkDcagwdI2xx/pE/z9/ZhsA7qKT0rDLR1MytFxC8WfJY1vBEsG9YJlq1GIno5zfcNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615744319; 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=Xb/MQMi9lX5uF6bVn/cchHAI0J/bHJfsMGiaPew8MhmlM+oMhk6nwdg6NrQJRoECpJ2oHo+eXhJIeiXfJBNdOUfP5ACi0Qvv9IysUqM45Ewt4dmx+yTdz0LZr8TN2FYyoO7hr3445bHugT97vv7sQE0g7pbh5C/dTthzX/5ip7w= 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 1615744319363138.6378434057682; Sun, 14 Mar 2021 10:51:59 -0700 (PDT) Received: from localhost ([::1]:55314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLUuE-000665-4y for importer@patchew.org; Sun, 14 Mar 2021 13:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLUsq-0004NF-Vu for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLUsn-0006ex-Kk for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: by mail-wr1-x42e.google.com with SMTP id e9so4548028wrw.10 for ; Sun, 14 Mar 2021 10:50:29 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a6sm11442749wmm.0.2021.03.14.10.50.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 10:50:27 -0700 (PDT) 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=PIsfCB11tkecpyathGQbXLv0+21/6sNWr5QYRGJ0nweokvPXq2Rj3S2e9SVRdrX3HH egPptRaz5Qe8tZxlkz0S9R3JmWd9wHrwV2VDxJdkRkT7r6Z9omU4K/rpF9QwQpa90ZjA UIro+V72ZB07u3ier+A0hzywDoxheyxx+nGHNvOZEm6ZCUMUzmohhtISGH9ha85v5aF+ KZjo3Y3x/QBPqWEkPNd3NaS2joe4vVegxHJp0JExCQiONv8LxiWBKmUtAyQsn45JBjyJ BN2TDg/w9ViOSWCVxVy2JU2RNbSH25UkR/KJ5RR93Wu84TXS471Hu42qcd3ZaFhipYBF QlgQ== 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=rtMhIwj6jUW+3xUs1G7X0vBXbkBWjqZ4NQ9R75TgOnG0UfrFRiqsqiqPLX6UGIpRm0 0jTrhDBDx6qsKAcGWNxx7Jyv1P193yEqNsAHYxfvuj1KZjOnOtwXEVizMg/+Pl8b5bxD YTSmQAP4xq8TshcpQc6BvQtgP7xmBN7KmaKpjaoGEtO4RRNfVxmlZGjfZZYQxPCcpX81 Ya8QAwWDCo1Dcj2T1AETH6f+HV2cev361JMU5lSNMXJuMiYIJ4tVY8Z45F5LbqIrOYeK ws95I5Ac/TjY4qDNbnrdYbpqHjwXZJNQp4DH391fn9dq8/zL1L6mcHMVfMhwjZtL7Fx9 YnzQ== X-Gm-Message-State: AOAM5301reuiOhemFDPAIg5HRfUljjZ5zJR16J4iAq1DbbiBgXYAVkP0 +h/7ipqi1wySm2mfVXxTrHYyGFEECX0= X-Google-Smtp-Source: ABdhPJyqpE728lFJk2ECFaMQK2kasLU1Y6GpI3dnFCRR0HaoldEvv/mJreQKmXO/I6JM5CBAAtrQ0g== X-Received: by 2002:a5d:6703:: with SMTP id o3mr23636618wru.357.1615744228313; Sun, 14 Mar 2021 10:50:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/5] hexagon: do not specify Python scripts as inputs Date: Sun, 14 Mar 2021 18:50:22 +0100 Message-Id: <20210314175025.114723-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210314175025.114723-1-pbonzini@redhat.com> References: <20210314175025.114723-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::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.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 --- 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 Tue May 21 00:58:41 2024 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=1615744319; cv=none; d=zohomail.com; s=zohoarc; b=fAuartHFejNZ5HxZQotbjxaYCy4+CsIp2/bmQimpZA+ng1yYy5Ak38b9eODP7MRS8Xnsn0CONoOOjcUJhBrNf8eNsu3K1578FT11yEVrL7Izg6p2MNOSE4zA7HXfMTmOLj+WybKUv1c580QsuD4iatKruVjT7ofx+p6vdDfhwoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615744319; 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=Df9tDMSoBKZrj4s7hO9MmImqI3RMlORQw1x/JxdjWJcIKb9H4GRuH0+JGJXcduOuqTMhMGgUXBO0sKO6lD6OtNIhLKuYIHvauMQwni8/rGZEIavYFZuv6pQnHdm7jSU0yvRya9239R/vwL9xT5199OgDsz8X68L/ma90lmfU8tQ= 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 1615744319347172.61402966022183; Sun, 14 Mar 2021 10:51:59 -0700 (PDT) Received: from localhost ([::1]:55362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLUuE-000677-7f for importer@patchew.org; Sun, 14 Mar 2021 13:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLUsq-0004NB-RV for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLUso-0006f4-6J for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: by mail-wm1-x336.google.com with SMTP id c76-20020a1c9a4f0000b029010c94499aedso18895354wme.0 for ; Sun, 14 Mar 2021 10:50:29 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a6sm11442749wmm.0.2021.03.14.10.50.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 10:50:28 -0700 (PDT) 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=EoSlSzUZRKpk0KkUjyGNHY6JwafYasrHT5nE3uhggImxbOcokch/uTAEqYrE8DG4Y8 oahC++mVY58qPivkUEdwTmbdm8Lj3A1HZdyivA2Y5dKuaOhNwM+5YXUSt3WDCZYZQhI6 Qp1y/jL+/RkEQVUutIBYS8v7+bz/01qAz1a4+JneEkq/l5KV7OwNMKgijSgqrAmzMf4k ZbfaVxzdudXD/SLLP6bYOKcgphB28A/8g2G//tezsZcJx1ZZb0xXFsFcM9nE35tsM1JA Vxjpgr3R7iWe5fmLsnxJYIs9FEnMRnKWA8hvPSRSTyj53Zh/WlzBfB0L5C0FW6mamwUa XvPw== 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=o+zTk0FLtjZQzXPU0T8GtDtTNLRhy0gb5yviJ4ktQ19OHJIxpcMqGm9j+GdWGuiEWS mbYmf4vRs4KTNAahbGiRq7C/vqXmS1W1zzkbbqopVxUMHVqTrbJL78tLm0ZUSI4/PYKu QStAh8g1FK4a+3J2vy+eT55Mzr7XJQTSZn75nGW6wtMbsgPIzW2WXHqUC9E4kPiHhmNe d9Io7PNyhnM/6yVdm9tej/t20Ibm16B8n69QFk4NV2V4F3JM85kNw4HdimZpRwNGWVoB 5RvMp3xxszqFx0tWFNRJ/kTr1I/yHCpSvYtgNL1xW2vVnnr3950zgTwEy0oh+NFLWiEa sDaQ== X-Gm-Message-State: AOAM531J+OOATnG3b65RjLDKAhCDKOxQ2W+ji3h0fbID0lF4uiWUP875 dkTALjqdk5SRqMcJN1m0CiHJNUxvsRs= X-Google-Smtp-Source: ABdhPJykB1uj1yAqZbuPXVm6I6loO3r0r3KOXxR8tOgyeiWT27GfWmzSHFT7vvxFKwLusxZEu4e8iA== X-Received: by 2002:a7b:c087:: with SMTP id r7mr22673119wmh.110.1615744228944; Sun, 14 Mar 2021 10:50:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/5] meson: bump submodule to 0.57.1 Date: Sun, 14 Mar 2021 18:50:23 +0100 Message-Id: <20210314175025.114723-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210314175025.114723-1-pbonzini@redhat.com> References: <20210314175025.114723-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::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.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 Tue May 21 00:58:41 2024 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=1615744323; cv=none; d=zohomail.com; s=zohoarc; b=S+v2IrxTSqIoQlxGoI3NcC2tMCEIj49aK4+9m8nFWIPZxOy0gjicQYc/E6uAYFcAR8NO1cWAKh6uEE+qr0gpvVXHf9ynJSdsiHZUW6Wu5CzoxbTi65+3I3v74m0QNUZs1gvOqxw8OJNO8LP6CD5atL6hlktp7w5zNz7X2lofqTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615744323; 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=kb3yXKL20wBeIPXprWyj3BOQ9KtpBTl8S4L+9ey0gL8=; b=a+JW0uKMK9G/qk6FsiQvveAerbdX/5tSrjwiMWjdoiF+Wg5ZMgN9TeSzRvpSwfpkYuYV8zONVUAaU9WInixqfP7Aw8rYUYzo2VUOZOkXE+CRm9ctKq5otR0hFRLK6dDpax8+PdL9y1Aw6xVN88sQigRwBSfyqdxn0CKORqtxS74= 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 1615744323102669.1349752486954; Sun, 14 Mar 2021 10:52:03 -0700 (PDT) Received: from localhost ([::1]:55698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLUuH-0006Fx-W4 for importer@patchew.org; Sun, 14 Mar 2021 13:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLUsr-0004NW-Em for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:33 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:37055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLUsp-0006fR-4f for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:33 -0400 Received: by mail-wr1-x432.google.com with SMTP id v15so7548445wrx.4 for ; Sun, 14 Mar 2021 10:50:30 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a6sm11442749wmm.0.2021.03.14.10.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 10:50:29 -0700 (PDT) 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=kb3yXKL20wBeIPXprWyj3BOQ9KtpBTl8S4L+9ey0gL8=; b=Xe+y/r4b9ywUd6E+Z1VZATSS4nPTUbyPtGkxdwgpklqgrIxFpe6vQHRaah4zfgoZJ8 48KM4anIKfnPYlWoGhR/BQzJwvbudJic4UisuUX851Zvg1RDX61fJAJ+/1H5/RKncbSW 3cN4JZSCh/WEDNcGifGDRZXn3e2H/O220Nsu1GgIKZdwvXasbmIou+CB32bWsau8ZlFA W4Ax+2QaiKsUXgJUCTFHOKufubM5SUt3MKJvVlgCjoVBc1XQLMHMFx/9pZSTs8afuQUw hbp9XQIhr/GQpag9emRWS8Qe24A5C9Jjz+TAh/Y25pT9Usi7EKoQhpNnh0eLEWQYC+ji D5xA== 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=kb3yXKL20wBeIPXprWyj3BOQ9KtpBTl8S4L+9ey0gL8=; b=ljSmo55EFThPd96A5SXsRtESM5yut6Yg0sa1/d0Y+FvVutukQXqKy4JGb763AvnPCL ndgKM3D9dac1t7As/dpEjhlsn9sOV9umPyBn13JNVFY31yZvNNb7FM7YZ9dB2ULcrVtd fiLe/zk6wKMqn9mIM86SC+JxaovTkVspRoE4mVTCDjZ4omDrc+qsADWTYXQ6EWNkePQC xv3AKBfBqjZRcugXYsVT18lbbmypyJl5dxhewEFaAOQENw7LxMz1ZvqBFEWBuATlPijp NJNtueVDbyw68cjeQn/14Ev0rGVbcdhweDR3+geLXG8W1x5n7dbMwuU2WgaZooEEjaxe CDIA== X-Gm-Message-State: AOAM533+frJodO/XxhexEasn/kkdlfr4jywyroDmZ1gPBqA5QG1zmBqJ AIhF8QvCtFaCKCvVayOE1eA1YWcmT3M= X-Google-Smtp-Source: ABdhPJxt5FlFwCsjv4m4GZ++S7FSpsVMD1oQbDn/pMy0CEeSE/a2LC9vBzEtgZIDRt4dc2LDIQ5IWg== X-Received: by 2002:a5d:400f:: with SMTP id n15mr23163186wrp.89.1615744229643; Sun, 14 Mar 2021 10:50:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/5] meson: switch minimum meson version to 0.57.0 Date: Sun, 14 Mar 2021 18:50:24 +0100 Message-Id: <20210314175025.114723-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210314175025.114723-1-pbonzini@redhat.com> References: <20210314175025.114723-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::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.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. The CentOS 7 dockerfile change forces the rebuild of the container. 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 +- scripts/mtest2make.py | 7 +--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/meson.build | 2 +- tests/qapi-schema/meson.build | 4 +- tests/qtest/meson.build | 2 +- trace/meson.build | 4 +- 10 files changed, 43 insertions(+), 55 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..f637b30f52 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/scripts/mtest2make.py b/scripts/mtest2make.py index cbbcba100d..39350c221b 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -60,11 +60,8 @@ def process_tests(test, targets, suites): if test['workdir'] is not None: print('.test.dir.%d :=3D %s' % (i, shlex.quote(test['workdir']))) =20 - if 'depends' in test: - deps =3D (targets.get(x, []) for x in test['depends']) - deps =3D itertools.chain.from_iterable(deps) - else: - deps =3D ['all'] + deps =3D (targets.get(x, []) for x in test['depends']) + deps =3D itertools.chain.from_iterable(deps) =20 print('.test.name.%d :=3D %s' % (i, test['name'])) print('.test.driver.%d :=3D %s' % (i, driver)) diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerf= iles/centos7.docker index 75fdb53c7c..dc36b4ebc3 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -28,7 +28,7 @@ ENV PACKAGES \ mesa-libEGL-devel \ mesa-libgbm-devel \ nettle-devel \ - ninja-build \ + 'ninja-build >=3D 1.8' \ perl-Test-Harness \ pixman-devel \ python3 \ 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 Tue May 21 00:58:41 2024 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=1615744428; cv=none; d=zohomail.com; s=zohoarc; b=MwYcw4Qxs1QdUw2uDGT1J/dMxOh3YHrP4vcjcWJaK4hMeFrwVN5JUMLSn7bTj0CQrZcqZFEAoeh0Cf3chQP6GDrgO5MB6XHfx2uFg9jGkEmAhrQ8jeS2PJhWA0WzThX1bErBbdAeM3qVSRms7DLZZaCL9HAEW9JmZVuO2CYYpuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615744428; 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=hrZZJiYqMCOMaY9gGFIAX0yynKJUK3v4qTH9HcNCF8WAP8WLZqMlHke8Qn3g8nne50HDFrOkLK44oZ47G7pFmPlNopj9MxHqz8N5QwLyPxcOiU8nMWD0Bb77KFoVTBYs3tRM1H1BI8aTs+aVttXwesVbU2F/fs2R/+kqdjtGFwg= 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 1615744428648512.2980544129126; Sun, 14 Mar 2021 10:53:48 -0700 (PDT) Received: from localhost ([::1]:33678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLUvz-0000OZ-Mv for importer@patchew.org; Sun, 14 Mar 2021 13:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLUsq-0004NE-V2 for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:45869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLUsp-0006fm-F4 for qemu-devel@nongnu.org; Sun, 14 Mar 2021 13:50:32 -0400 Received: by mail-wr1-x42e.google.com with SMTP id 61so4548399wrm.12 for ; Sun, 14 Mar 2021 10:50:31 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a6sm11442749wmm.0.2021.03.14.10.50.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 10:50:29 -0700 (PDT) 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=s0QCUFXGJE5CkEya4qhsBpal6oevQPylOLuEu7wswHXLJ0WKIUSfEjWnKvXIit59x6 6tn7bxePTGCw0AXWw3J7w974xk4ZcttVNN0fjEPWMqZqA2O2vIS60Aqvsrzv3txptUjq 5a6ySS8QW+EPvdbbj0yekUsN1ccnxLXZSfi9yLZGma7fnir8yNMv/staiwqA7/rHjtW6 H5cW43KBxUAyKJMAbVZRuewB6vQysrM7PAg6JbbAtXb4EXKbzn0juqR0pB+bySJf9ltl P2h/vDHHcFsbmZ2N1uBfzGVMGdctkXL7TD9xHiwOTLKsiTfDFFj+oNLppFMDZgl2hd+P PYZw== 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=MbnevBgOxb6cDNnJJZCsKkacTDb6v/Fo0h8gaAsh5u0ssi8ZiH09F13NPooXkTVZ6v fudn8pEmFjTrgT5o3rc/vc6bOVLR1mFxJqYgv7fnlUjqVEI61MMH1BX+olKP/KykKqa8 dhiQPLK7MsigEJb6rgEwnfeNKNa+CYvGJd8JtCOwT9CI1/paE557/acYWOFwzDuo/v52 gl2gPACSkxJoXWpNmo4qmWpufE2ffGVIh8aMtQ52vT+HtlvqeTbLgmcp/D1Y2SzX9N+3 pW04aFjRwUGkDIITK8fVKT5drR/F1BhhlIZvxxBegP1PcFhKX5+ycZN2tJxy63dugh0B VANQ== X-Gm-Message-State: AOAM530nr8uuprQmS7hbbx98fMgt480NWHYUXNxU4fcO/VmGwH2N3qWQ 1AfwwEek3mPOpnkt65VH4BWb4uV+DIE= X-Google-Smtp-Source: ABdhPJzcs/stBwgmJD/EIHZtYsVlI5+7oqD2ZC1AdlzbAAwksFUOtQosQeeOEKMPKJ+dbv+wdtmpvg== X-Received: by 2002:a05:6000:10cf:: with SMTP id b15mr23708166wrx.183.1615744230277; Sun, 14 Mar 2021 10:50:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/5] hexagon: use env keyword argument to pass PYTHONPATH Date: Sun, 14 Mar 2021 18:50:25 +0100 Message-Id: <20210314175025.114723-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210314175025.114723-1-pbonzini@redhat.com> References: <20210314175025.114723-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::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.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 --- 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