From nobody Thu May 2 07:04:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631724845271577.7519228545797; Wed, 15 Sep 2021 09:54:05 -0700 (PDT) Received: from localhost ([::1]:35340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQYAe-0001js-6D for importer@patchew.org; Wed, 15 Sep 2021 12:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQY0Y-0003Rs-LH for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:39 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:39560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQY0T-0006Yi-EP for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:38 -0400 Received: by mail-ed1-x529.google.com with SMTP id h17so5880383edj.6 for ; Wed, 15 Sep 2021 09:43:32 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v1sm238319ejd.31.2021.09.15.09.43.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 09:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xWYtDan3pEXu3qMZtaWU1X/f9DRe7zuT6HxLtpUUEf0=; b=DrpeZsUo2M6JkHVwfxTq5KbTWMz6AXOM/uNYF7+uiwo7XImB25Evhz76V9xjB0Grav OyNGiwF52mBM+T/o94hdjACR47oVGnF97J+4fKZ0v1sF4I1Yq5mFhqsZyo3HwEAR55UE XIryXgCvJxvpXxSxn/WKm6exzgo3JQROegC2ZvrOh4fUpq0WeXnSaVe/DYjxJyMrBDM1 ZwGVXpVl5XnBbtqAB8yt1BWAgSa3mELZGuDUQYU5XminOkabsD+FaYcHmEdgabiJ86UL vi1VR2ddrhd1yB001mH/8P15uuH+UA5/rCHVJOM5ZJ3FcBXdmt16uf47Zd7wdakLKp9Q /4gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xWYtDan3pEXu3qMZtaWU1X/f9DRe7zuT6HxLtpUUEf0=; b=W0B1s5JhLw6T8EBDR1yaXU7pz3UJpFi1pbbXAXSHIuBma2Od3etWBwGPdYRoxMCHVz pr/NJvFwGdweCWEuMwqP0fh7grt2/G6hH4v8QVSg0qSuezXltf05XzrpMsJxjPxCsT3A Fe8j4zyW1Ddka+qErfuxEUNm/A1ywED6aMkOn2BbsBXTi42B6luv7fXDngZPeScdtqgd ipIHwAsgsNrUVTqSCSdM1G4A8F7WpP8oJb/OtLYB1VLWvXkn0Q55M7ywBoJCycZNdpq5 wgzkLK8W38qBxzfhrzhYf+inS4yavC2cdPLwtPHnI0/t0c19zvEjn0wNnUguRyu/VItK FfLA== X-Gm-Message-State: AOAM533p2luck2YjnakJ578AhGFsImPIh6i30X5OYBlZi2OpWJXTED2Z rxMwIMQy8hyycWzZeSMfOcql6wSAHdU= X-Google-Smtp-Source: ABdhPJygqcFdwr4I+LQP12QVfrHD4wZ06s3aRKYVvJx6Z1RHaHOOX4oQjBFoHKpY7ZeK8/mwy1mtsA== X-Received: by 2002:aa7:ce14:: with SMTP id d20mr992385edv.132.1631724211487; Wed, 15 Sep 2021 09:43:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/4] meson: bump submodule to 0.58.2 Date: Wed, 15 Sep 2021 18:43:26 +0200 Message-Id: <20210915164329.13815-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210915164329.13815-1-pbonzini@redhat.com> References: <20210915164329.13815-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::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.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.25, 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) X-ZM-MESSAGEID: 1631724846331100001 Content-Type: text/plain; charset="utf-8" The update to 0.57 has been delayed due to it causing warnings for some actual issues, but it brings in important bugfixes and new features. 0.58 also brings in a bugfix that is useful for modinfo. Important bugfixes: - 0.57: https://github.com/mesonbuild/meson/pull/7760, build: use PIE objects for non-PIC static libraries if b_pie=3Dtrue - 0.57: https://github.com/mesonbuild/meson/pull/7900, thus avoiding unnecessary rebuilds after running meson. - 0.58.2: https://github.com/mesonbuild/meson/pull/8900, fixes for passing extract_objects() to custom_target (useful for modinfo) Features: - 0.57: the keyval module has now been stabilized - 0.57: env argument to custom_target (useful for hexagon) - 0.57: Feature parity between "meson test" and QEMU's TAP driver - 0.57: https://github.com/mesonbuild/meson/pull/8231, allows bringing back version numbers in the configuration summary Signed-off-by: Paolo Bonzini --- meson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson b/meson index 776acd2a80..8bcd4c72e3 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit 8bcd4c72e321705cb6cde02c684ffd2ec5cc8843 --=20 2.31.1 From nobody Thu May 2 07:04:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631725646005414.97527321103814; Wed, 15 Sep 2021 10:07:26 -0700 (PDT) Received: from localhost ([::1]:56170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQYNX-0007vD-Vl for importer@patchew.org; Wed, 15 Sep 2021 13:07:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQY0W-0003R1-KI for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:37 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:46955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQY0T-0006Zt-QD for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:36 -0400 Received: by mail-ed1-x535.google.com with SMTP id j13so5843725edv.13 for ; Wed, 15 Sep 2021 09:43:33 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v1sm238319ejd.31.2021.09.15.09.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 09:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BzdeDv26MNLlBDBszSGaLgrKChR4P2P+vgi5E2q64Xc=; b=KVdj5khVmf2xmF/20cLVcvckOZ3iTTbfbkM13XbIFy/dx6ViIaHAGmv3HPLp7DkYER KH1IKa74f4x3sd4JL9xG9LpUW7lSRJvZ1ghUVQB2ylLIPMq5yhlp9D2lGRHoBa0qdpUE DW9NWI6zru9H37wxnbdYcMGEA9uw4OOD+E1du/MWernsZIKI1cnLkmLSk7mLPSpEK0gn fR7bMWLxVexqxfuQYeLCbWAVacmSkoWciySCVxTBBeukZgmDYajgD9PXCizjXvtz7EnG DVtKAq4vYCO0VVY4ZikLeJgf1BIMu0jgu8s8z/GHwBWI1H7lgC3C0nrzSkqbSbDVHWBm 2dtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BzdeDv26MNLlBDBszSGaLgrKChR4P2P+vgi5E2q64Xc=; b=waDk8Tt2n5vdm7+NizIl/n8qFfXm4ywOVWUKayPEYjDTfrkUQ8unTNsK0qAryF8uoe 7XSofnX4ow56efVg0iLaSqPBYS7oS7v/BTvIjgx1N3AGnlw4mhlqAcacyRM1oZI4d3iN luIfdyA8TBn6T/u5BBnHRMiYoCn3srpBrE2MHQzyQyiYh5cVCCYkzGf6QqlPHtRoql/u zeQAZ351bg0pcjV9oeGDVTBzqJTEjYI0J+59KPiAsVr4pMUpG8jHsjCIGHEIm9dOE9cA 8hy0cr0J66QAJWxDLRphSdfpiNh0EdjZ3vzWARw7HLj7oMYqou8Cd4MNP8RqC9xwOjnl /gew== X-Gm-Message-State: AOAM5304hbWBPwh58cNiv+pOLDJCWYk1cKqtNdEMor/TPogUih0DG/3d VfWUB48gGE6OtxJ5npeDZxy4JBDJeoE= X-Google-Smtp-Source: ABdhPJxctdxazpH9ei7VJUdCTBfEB+yXYRivPTACRSW3f+d0pzeOM7jxKDL5uCEEpgmRX35YAG6g0Q== X-Received: by 2002:a17:906:1e11:: with SMTP id g17mr1042877ejj.154.1631724212248; Wed, 15 Sep 2021 09:43:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/4] meson: switch minimum meson version to 0.58.2 Date: Wed, 15 Sep 2021 18:43:27 +0200 Message-Id: <20210915164329.13815-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210915164329.13815-1-pbonzini@redhat.com> References: <20210915164329.13815-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::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) 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.25, 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) X-ZM-MESSAGEID: 1631725647830100001 Meson 0.58.2 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 | 8 ++---- docs/meson.build | 14 ++++----- meson.build | 54 ++++++++++++++++------------------- plugins/meson.build | 4 +-- scripts/mtest2make.py | 7 ++--- tests/qapi-schema/meson.build | 4 +-- tests/qtest/meson.build | 2 +- tests/unit/meson.build | 2 +- trace/meson.build | 4 +-- 9 files changed, 44 insertions(+), 55 deletions(-) diff --git a/configure b/configure index da2501489f..bfe1fddf4c 100755 --- a/configure +++ b/configure @@ -1995,7 +1995,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.58.2; then meson=3Dmeson elif test $git_submodules_action !=3D 'ignore' ; then meson=3Dgit @@ -5162,10 +5162,6 @@ if test "$skip_meson" =3D no; then 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;= fi) - fi NINJA=3D$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ @@ -5185,7 +5181,6 @@ if test "$skip_meson" =3D no; then -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= \ @@ -5221,6 +5216,7 @@ else perl -i -ne ' s/^gettext =3D true$/gettext =3D auto/; s/^gettext =3D false$/gettext =3D disabled/; + /^b_staticpic/ && next; print;' meson-private/cmd_line.txt fi fi diff --git a/docs/meson.build b/docs/meson.build index cffe1ecf1d..be4dc30f39 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -37,14 +37,14 @@ 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 ] - sphinx_template_files =3D [ meson.source_root() / 'docs/_templates/foote= r.html' ] + sphinx_template_files =3D [ meson.project_source_root() / 'docs/_templat= es/footer.html' ] =20 have_ga =3D have_tools and config_host.has_key('CONFIG_GUEST_AGENT') =20 diff --git a/meson.build b/meson.build index 2711cbb789..3945a6cc2d 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=3Dgnu11', '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=3Dgnu11', '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 @@ -1963,21 +1959,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 [ @@ -2624,14 +2620,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': [] }] @@ -2640,7 +2636,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(), }] @@ -2648,7 +2644,7 @@ foreach target : target_dirs else execs =3D [{ 'name': 'qemu-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': [], 'dependencies': [] }] @@ -2667,7 +2663,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 targetos =3D=3D 'darwin' icon =3D 'pc-bios/qemu.rsrc' diff --git a/plugins/meson.build b/plugins/meson.build index bfd5c9822a..aeb386ebae 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -2,9 +2,9 @@ plugin_ldflags =3D [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.build_root() / 'q= emu-plugins-ld.symbols')] + plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.project_build_roo= t() / '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_bui= ld_root() / 'qemu-plugins-ld64.symbols')] endif endif =20 diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index ee072c0502..02c0453e67 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/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 6b2a4ce41a..6a08d23ce8 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 [ @@ -253,7 +253,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 757bb8499a..e1f4df3df8 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -275,7 +275,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) if have_tools and have_vhost_user_blk_server qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qe= mu-storage-daemon') diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 5736d285b2..7c297d7e5c 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -43,7 +43,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/trace/meson.build b/trace/meson.build index e401e7c415..b8f95de200 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -4,7 +4,7 @@ specific_ss.add(files('control-target.c')) trace_events_files =3D [] dtrace =3D find_program('dtrace', required: 'CONFIG_TRACE_DTRACE' in confi= g_host) 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 @@ -70,7 +70,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.31.1 From nobody Thu May 2 07:04:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631725130907339.8355786012029; Wed, 15 Sep 2021 09:58:50 -0700 (PDT) Received: from localhost ([::1]:42660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQYFF-0006lJ-TL for importer@patchew.org; Wed, 15 Sep 2021 12:58:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQY0Y-0003Rr-9h for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:39 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:43839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQY0U-0006Zz-84 for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:38 -0400 Received: by mail-ed1-x52b.google.com with SMTP id n10so5742461eda.10 for ; Wed, 15 Sep 2021 09:43:33 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v1sm238319ejd.31.2021.09.15.09.43.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 09:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VMxPJY6t4uoMf/I961hE4R2GzgtcCFDrssDoN4r5NzQ=; b=ln2cgUN/OEgN1Cr7zoLKrsVHPHK4qCJDNRZATl9WfxIiyvwr5+iJ482g0/7+FoRm9k wgYqL+QH16qe58hL+JlWiM4i99mh55rI1o1sVOLEuXj+4q4gNq94arK2cHHkCO1+eX2t NjHx1V8rlCevZd4pqrOCo+RgFbNyEO/A20q3CdFx7nexKV+YxqvAUPrGkpXbnD8uvT1p Dg9V6bW/v2Chg1VFbSOuX/URy++ywXucw2hrOVZHqdxx20+1CxgwkuNQ0kpCWVoqN+7h jTMEhK6PXFswIVOkBev70ErSXFyEyOhgtkA9qIKxs/lZ/dYsu1PQ4Oyytd04SvRhWoY9 fh/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VMxPJY6t4uoMf/I961hE4R2GzgtcCFDrssDoN4r5NzQ=; b=mcmMv4TtGMN6l4J2PE6ydqkXSDQ/ChCcdac/n3a840oCq6i6Az6HqgdbfotHqaH712 TwUCtZmzhdXkWo5gzwTLjkbwtp2ER7aFmAzvztwR4/9W2hQuPCl/hvyWt44XSaSGGLiB GQFHbGYbUx62ujJAfHxAGTat6P7RiRBaV4iEcgCd7uezYjyXaBbRqeIYYdBOEXq9Ix9u 1+yGsxvJdc7pPTD635uY9X585/hw/9AEGzwm631zSi0W74Z6+SbQfg/Xr2AcR47KgHw3 kO3KsaslgNrbwYZGHYmqof7ZwyGHbDRSg6cNs39OZSigJt96ArZhMQg/565rj0aMauPT bXqA== X-Gm-Message-State: AOAM532wygvhA7eBcV+bQGSIJ16o+51ee8H2UDxUPw6wUt93V1a6fc+u 5802mzFqLPyKC076K0xr0ZyrHw+eXEk= X-Google-Smtp-Source: ABdhPJw7staccBP/slH4d2RKHA5p7DeuLf6iIa54n5Qyxx6ehwMLKgDdtbfoBBd8/e3Vi3jJV9eBFg== X-Received: by 2002:a17:906:774f:: with SMTP id o15mr941411ejn.200.1631724212904; Wed, 15 Sep 2021 09:43:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/4] hexagon: use env keyword argument to pass PYTHONPATH Date: Wed, 15 Sep 2021 18:43:28 +0200 Message-Id: <20210915164329.13815-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210915164329.13815-1-pbonzini@redhat.com> References: <20210915164329.13815-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::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.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.25, 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) X-ZM-MESSAGEID: 1631725133121100001 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 6fd9360b74..c6d858ffb2 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.31.1 From nobody Thu May 2 07:04:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631726201589734.2154531721724; Wed, 15 Sep 2021 10:16:41 -0700 (PDT) Received: from localhost ([::1]:44984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQYWW-0002sV-Ik for importer@patchew.org; Wed, 15 Sep 2021 13:16:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQY0X-0003Rp-Od for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:39 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:34593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQY0V-0006ak-FN for qemu-devel@nongnu.org; Wed, 15 Sep 2021 12:43:37 -0400 Received: by mail-ed1-x52d.google.com with SMTP id i6so5936264edu.1 for ; Wed, 15 Sep 2021 09:43:35 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v1sm238319ejd.31.2021.09.15.09.43.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 09:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UArhIR2Xzaj04yqObEvMGnbWPul/JgDRnUvix747Vb0=; b=m2Nia5sg+LD22AJ0b9c3iICcTN1cboe8n0BwnSHnBoJptCI8zT8g8xBh1LEhZg2g8A 1gk0+/9M/0GOffQodsSdtti9A35rpQfhU+nRWAaw5co5NZF8kU3a7zJf2Gkx76ttwrk6 pVKACJue5KkgvYG6T4h00CG1QeuGm9JR3IUao3lttPOOnBzTPg1NL46j84trx/qAD/oI l3neD0J/e1jQE1sMmBgTVgOVQtiuPZn/KhSaqZqk7BBQmNiEel1DyW7RFpbW1sAQuiNn BvD9LpAdaHgZWbUItRsKHNL2Z+JKqJ9x2N+safvRBTpCR1NwqmPROuK0YCHrzwAHwghG 8DBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UArhIR2Xzaj04yqObEvMGnbWPul/JgDRnUvix747Vb0=; b=6x/cnIkaghY8Sle6pw3JmxO+hlh51eTEpUBsThqAmiIDMvzGNhaMnQyD3B0O2q/EYH 9GURhIUiDMq1sdU94eLmpbFzWwrr5E53OM7EklkG2CyFJcdyLV/kH22hg/hV8uixq3Zd X+I8z0SnxFFW6oFsME3NGmhsJfYuevIzWZ3HgIO77BKHlll5zdy1+CwCPmwWzIQbLVFV 2KJhGZFxcF9VrxW7S4PSC3I0opkZIP6TWCSFb7ObcZ16nGiNS+v7qIl1r8Nr8rGbBJNE MfMvylIoSlEqoLzVZ4k+9eakNmb+zpS3Zevdp4LxrMB6vyhnRgggBUO2fZhPmeghJ0ZB soow== X-Gm-Message-State: AOAM533NgyFEuMv2b+alNGWPxjrmIdDsvBTKVbFKiLjkOe+QnpyItSls c91gv65e/FiYSQrXSR1KGR9UOLjacjg= X-Google-Smtp-Source: ABdhPJzs39hzuNj0uWtRIEFyPDdl56aDVNhCqDmjT+xyB/rU4XK/dKafiMNfDRjL7+foUVyfEcnwfg== X-Received: by 2002:a50:8589:: with SMTP id a9mr977490edh.124.1631724213511; Wed, 15 Sep 2021 09:43:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/4] target/xtensa: list cores in a text file Date: Wed, 15 Sep 2021 18:43:29 +0200 Message-Id: <20210915164329.13815-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210915164329.13815-1-pbonzini@redhat.com> References: <20210915164329.13815-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::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.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.25, 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) X-ZM-MESSAGEID: 1631726203690100001 Content-Type: text/plain; charset="utf-8" Avoid that leftover files affect the build; instead, use the same mechanism that was in place before the Meson transition of updating a file from import_core.sh. Starting with Meson 0.57, the file can be easily read from the filesystem module, so do that instead of using run_command. Signed-off-by: Paolo Bonzini --- target/xtensa/cores.list | 9 +++++++++ target/xtensa/import_core.sh | 3 +++ target/xtensa/meson.build | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 target/xtensa/cores.list diff --git a/target/xtensa/cores.list b/target/xtensa/cores.list new file mode 100644 index 0000000000..5772a00ab2 --- /dev/null +++ b/target/xtensa/cores.list @@ -0,0 +1,9 @@ +core-dc232b.c +core-dc233c.c +core-de212.c +core-de233_fpu.c +core-dsp3400.c +core-fsf.c +core-sample_controller.c +core-test_kc705_be.c +core-test_mmuhifi_c3.c diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index 396b264be9..df66d09393 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -66,3 +66,6 @@ static XtensaConfig $NAME __attribute__((unused)) =3D { =20 REGISTER_CORE($NAME) EOF + +grep -qxf core-${NAME}.c "$BASE"/cores.list || \ + echo core-${NAME}.c >> "$BASE"/cores.list diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build index 7c4efa6c62..20bbf9b335 100644 --- a/target/xtensa/meson.build +++ b/target/xtensa/meson.build @@ -1,7 +1,7 @@ xtensa_ss =3D ss.source_set() =20 -xtensa_cores =3D run_command('sh', '-c', 'cd $MESON_SOURCE_ROOT/$MESON_SUB= DIR ; ls -1 core-*.c') -xtensa_ss.add(files(xtensa_cores.stdout().strip().split('\n'))) +xtensa_cores =3D fs.read('cores.list') +xtensa_ss.add(files(xtensa_cores.strip().split('\n'))) =20 xtensa_ss.add(files( 'cpu.c', --=20 2.31.1