From nobody Mon Feb 9 03:17:07 2026 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 1633341290185356.4368089398198; Mon, 4 Oct 2021 02:54:50 -0700 (PDT) Received: from localhost ([::1]:49620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXKgK-0005BB-U4 for importer@patchew.org; Mon, 04 Oct 2021 05:54:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXKJo-0000uy-L1 for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:31:36 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:43650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXKJl-0007Be-Dh for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:31:32 -0400 Received: by mail-ed1-x535.google.com with SMTP id p11so9192201edy.10 for ; Mon, 04 Oct 2021 02:31:28 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d21sm5007143edp.27.2021.10.04.02.31.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 02:31:26 -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=/Pxn4hLvHFl7SP+PJwZ9WLDfJ3iclWlvQDwWKU4dNjY=; b=c4hk5CtRbcDWSPFS0gz5ypGifH7w884XkesqpTttFkSKJZVnzN9/4yTUxFdjIdX9SP OcFDbGPxXPu2aodKRr5TqL3ONHVi/oTAAIQF5GSQOdxdkSIwLI1hORud5XXwH5OXL4cu wFvQ4xHXHc1rygrwozf848RIlHWlbTwa0hDiJgeyh1vhlnPKnGBqja5lU6NGGJNKeLyk iMxFtNKMgKl4PpfokpHOyBHWwYePKpw4oh4UoaB4ak374Clu1L0Z2vAtFUWwNkvP3O6F HSQMpTJBiHhxYfKpOha4wYQPZM+Xg06FBA/Tf6oWEQSB3KX0u3JCIA5kMFkQTj/XUM62 cByw== 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=/Pxn4hLvHFl7SP+PJwZ9WLDfJ3iclWlvQDwWKU4dNjY=; b=AizAcM9JGuB60wbmLAAKpHQGavz/EfA+k3MiY9T+SZKLprGqWPrbpqOKak59lGSmiM VDrfFZg1CEb43NCzhEmTHICgZXlYMPiiyUQP9PmOWI+zg41HzGVsb2vZzTML2xiGy3c5 /TsJZ0vS1OBxvwz6OC7LVkrCjShYCowro0i2LAD0+pM95kUhFew/bl3TjtnWXqvlYLGV hrnxqbDTBVE8KCuG56oQJnIBHi8Q5mc3DhUWzxi3bwBv/DeAMpPz03t3lB2IBlsK2IFG QM0iM+e/GjUfeY3HQ859BAK2iEC6Td4w3ZSrBAzFzoX5ifR/wpx9nggn+6oWGCWyw3rN 2ARg== X-Gm-Message-State: AOAM532Ag0b1tVQ+u6UIG8a5VCsozgLsH1y6Z6h73E9Qx/s0XGToyw+7 zHAPX3f41famFlvJ78kn1c3zyFUY0j4= X-Google-Smtp-Source: ABdhPJxFFDTHBS7brb3H4dNGPELoVPF5si7FtruW3sARFlsOui2jDeJqrOvB6zgcNB2wXxQCsiz9rg== X-Received: by 2002:a17:906:3882:: with SMTP id q2mr16401491ejd.396.1633339886665; Mon, 04 Oct 2021 02:31:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/5] meson: bump submodule to 0.59.2 Date: Mon, 4 Oct 2021 11:30:49 +0200 Message-Id: <20211004093053.87883-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004093053.87883-1-pbonzini@redhat.com> References: <20211004093053.87883-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::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.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: 1633341292216100006 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 - 0.59: Utility methods for feature objects Signed-off-by: Paolo Bonzini --- meson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson b/meson index 776acd2a80..b25d94e7c7 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da --=20 2.31.1 From nobody Mon Feb 9 03:17:07 2026 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 1633341540413689.5081168361817; Mon, 4 Oct 2021 02:59:00 -0700 (PDT) Received: from localhost ([::1]:33590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXKkM-00056J-RI for importer@patchew.org; Mon, 04 Oct 2021 05:58:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXKJr-0000v1-Ul for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:31:38 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:45675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXKJo-0007EL-GK for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:31:35 -0400 Received: by mail-ed1-x52b.google.com with SMTP id r18so62187811edv.12 for ; Mon, 04 Oct 2021 02:31:32 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d21sm5007143edp.27.2021.10.04.02.31.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 02:31:30 -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=lZtkUOZRPllnU/d0sGJgfwm4nDJZZ75kr/CJThehi68=; b=W6SoskM7atZ80GeH7n8lHEs9/WQvfNP2pPGsRQDACNqACffN6qjC6lBVADKiKDrg6C eTngiy0MQf64IFUNXL+zJE0tm7cf2CCf2IuGQTGgHpfjC26KNWOs5DM6dskAGOYn2xI1 uoQySeXDA1dKCuKP1hiMTKXVwj6kPqWlOrVum4T3j+o+b3E0GLeybHmZJfjty+WAwYWb oKc34jb5cPHLBxhjKalu4MU8Y8Ni+x5j2oefALRpgYcwjn6kE6Z3P1CEjYeVeDwLdllr Qamkg6p90ZN1p/TE8sc15umjyX1GmYDZ7bHVRsMhG4ZZcyHjBlT9AGV6bVTzmf273TbG u2tA== 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=lZtkUOZRPllnU/d0sGJgfwm4nDJZZ75kr/CJThehi68=; b=Es6gtHjWYROSDRYMBTI3jFBflDdC9INDLYXMGlTTr6wLq6urq0RPxLSd81ajLXZuDu J5zJ9TNt3gZ5wT1EYu+obifRwTbVB7+5WpUd5c9lTAPbXm19GYF6EOOu9Js2+d7/lFDO GGPr+Cmkd1K+8T3GfRCVhkaRaOkQ/Rg31xSHZNuJAE/GCOymBAL+hk5ZIYt65EDeYsiZ IeaIIKromcU1oaqiuadggtp/ST7rxwKcmqbS6hEdL/sTrfGu7bTl4STO7WKtj4LDhKX3 8FGAMy3ps0wGPjSJvkf1r+7gk/IeD6xPBuj6fqkpW8I0CURxAI832B5re8b3o1ZfwW/x LwtA== X-Gm-Message-State: AOAM530cC2h2yZJHmUh3M9dsJjmtyELSr9esDomlfJYD9UMtgPKQ9HNY ZwNt+I0J7RU5e0E8ZiyFzIYQN93D6XA= X-Google-Smtp-Source: ABdhPJzD94HT/JWLl2JutupkaYZza9AkX0ntsWLWatEjbpw6LR38qZbBF1gfhsI1skOo9/8zG77nBQ== X-Received: by 2002:a17:906:12d4:: with SMTP id l20mr16057196ejb.43.1633339890679; Mon, 04 Oct 2021 02:31:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/5] meson: switch minimum meson version to 0.58.2, minimum recommended to 0.59.2 Date: Mon, 4 Oct 2021 11:30:50 +0200 Message-Id: <20211004093053.87883-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004093053.87883-1-pbonzini@redhat.com> References: <20211004093053.87883-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: 1633341540689100001 Content-Type: text/plain; charset="utf-8" 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. One feature that we would like to use is passing dependencies to summary. However, that was broken in 0.59.0 and 0.59.1. Therefore, use the embedded Meson if the host has anything older than 0.59.2, but allow --meson=3D to use 0.58.2. 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 1d3f099498..877bf3d76a 100755 --- a/configure +++ b/configure @@ -1994,7 +1994,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.59.2; then meson=3Dmeson elif test $git_submodules_action !=3D 'ignore' ; then meson=3Dgit @@ -5163,10 +5163,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" \ @@ -5186,7 +5182,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= \ @@ -5222,6 +5217,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 60f4f45165..17e77fe4ef 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.58.2', + 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 @@ -1972,21 +1968,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 [ @@ -2635,14 +2631,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': [] }] @@ -2651,7 +2647,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(), }] @@ -2659,7 +2655,7 @@ foreach target : target_dirs else execs =3D [{ 'name': 'qemu-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': [], 'dependencies': [] }] @@ -2678,7 +2674,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 6187efbd58..df5acfd08b 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 [ @@ -248,7 +248,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 19444d4752..c9d8458062 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 Mon Feb 9 03:17:07 2026 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 1633340102271492.92318676229127; Mon, 4 Oct 2021 02:35:02 -0700 (PDT) Received: from localhost ([::1]:40428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXKNA-0004Df-Rt for importer@patchew.org; Mon, 04 Oct 2021 05:35:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXKKL-0001Kb-UA for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:32:14 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:45692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXKKI-0007g7-2X for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:32:04 -0400 Received: by mail-ed1-x52e.google.com with SMTP id r18so62192885edv.12 for ; Mon, 04 Oct 2021 02:32:01 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d21sm5007143edp.27.2021.10.04.02.31.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 02:32:00 -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=ZO0EuWW9PywSMerGVyMCJtxrYVQ2fSnzqXtq0HVWcSijwA8UDVu7IQPOjJcRxZR0Nt me27zzblbb0WFiGfB4VqS0EIHdisTCOQxfkxGpxFBqrAsmKmsr1v+KsdRZBgnhngZ53C 61cqbrw80ukWdw/MDpHHtxGUQhDeys2Los9jh2WkKvJ6kXBjXgJeR3fSphL4d7hkU5Ji ssYU9BidSokM8oIe0+gG2abgITlFAn/Cyfoix/JJiDaSGer7QKVCnmool/5a2oYvjClk hvJTHKdvEddAE4WZCKAZ2qI0/7+pB4Cut/MXKNVcGHX+lOXXts8pe6KxRetH4a/eboCQ MZ6A== 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=Aa89rx7d1Aou1pNYWhqSxpA75BLebAIQmfcd48iVf8zfMbcODaNMRUWbSpg9Jof3ok pYzz0ziaH32lvb8gTqTfUMRVZOONgVWRqDCVRI1AJ4fjtHwgfEF/RTtuqFebmUW5L6oH +DYuFOUM2lrQ4lQ41z0et+NDUHPnEXIfTZg7yymCXG0ZVV+4ZCYbLgdoJfgiprxD20fP /Z1188mgM+iOYSESTcRLySfIrRDPCQwimlB2H7Y57nFtHIE7FQeq8D955IDoIyKcsN6k PZYUFXxxZF9zSfvg8yJ9Jkm//zrgjgqtnoxilJ8mWqlvurkWYVCZNio1Lv+dVrJAxrXB lW3A== X-Gm-Message-State: AOAM531012LoI70W5Mc8KsQjOEm1ewazZp9srHjRRWuzjRsetGgF4WLa rfcQPG0PAnwc1ft4H+7gwjfyd0v6S4Y= X-Google-Smtp-Source: ABdhPJzXG8QT03RyltZI7lTbgFCSLaoG65vMl7So7orPtEeMJEeWAmpkwyEJMno+zcP0mRgp7CuPxg== X-Received: by 2002:a17:907:7601:: with SMTP id jx1mr16063811ejc.69.1633339920557; Mon, 04 Oct 2021 02:32:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/5] hexagon: use env keyword argument to pass PYTHONPATH Date: Mon, 4 Oct 2021 11:30:51 +0200 Message-Id: <20211004093053.87883-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004093053.87883-1-pbonzini@redhat.com> References: <20211004093053.87883-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::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.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: 1633340104417100001 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 Mon Feb 9 03:17:07 2026 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 1633341855053176.38256880446272; Mon, 4 Oct 2021 03:04:15 -0700 (PDT) Received: from localhost ([::1]:41038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXKpR-0001w2-U0 for importer@patchew.org; Mon, 04 Oct 2021 06:04:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXKKU-0001M3-Qd for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:32:16 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:44741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXKKS-0007mt-IV for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:32:14 -0400 Received: by mail-ed1-x52a.google.com with SMTP id v18so61335790edc.11 for ; Mon, 04 Oct 2021 02:32:10 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d21sm5007143edp.27.2021.10.04.02.32.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 02:32:08 -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=YEHX6z3jYLlwMbQnpL7rnTmf4ttGHMXngGK3oaqLMcaRM+kWqzN21dxvyyH+FFm5gp VmraJXU9dy+mhkITBhdo6an7xpGU/SSvjHuJv3TKuMjuAqDUXwF7phX4lg+n3GJ/REGv t1hSpSSW0nb3c2V7KeQ8kvlOqEU63UqJtNakzs52iwuDC88k6mJQC4zL8gt5DVcdV2it xP1rOos/2usMkSWwO1BsD/ZibduseaAKJEuEIpnGvEjkZFNqhKYT6XglTU6KQDu7YBpX ndWgmxwwPuIvIpa3EZ//wVPcZzy5b+0RhQOPr9l9VWwf7JigPORYkCarq7rGgvgKsVG6 X9xQ== 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=eExjS6avoRA+RSA9atSLkfFTWFEAzEKa/ijXWWUBVWiboWxEkY1o6CEFhEcjHnV3fB fLPs1DLSCMIWJqqVYpZP6hjtW7/Oe12tTIekeEVwvKn44Owc9iS3NGDyJBDKXulpklx8 2xAls5/rAjCIvWF/RfncQlfLBujOhv7wacCZIENLEa4WZTl2UteTQhOXRMplBilAb1ev u+pGxShMxvIkAu3X4KyShN5hNnxALqgR0/EucXO5VuJqw2YIT85Qvxz0YfyVZpJr1HYn XrCxhotBzO40CVQ4KvF7sdxObJQMkPYl3rYUmtXaoxqv0vKrrnTD2RA8sNIDkM/ZTVZm am3A== X-Gm-Message-State: AOAM5318PLgn7oLeJA5kbJ3fhijYE5YC4fivrIIRm2vURBoD9kv08ekp qaKQtsEeVgfWWmdW4WprXR0j1+29VDc= X-Google-Smtp-Source: ABdhPJx2CbFCaHBPzMDidwyIdNU52Th47N5fwrvINDIcJRPH2q+wvR/fFQEBUOwDL8hE5wgot1T8/A== X-Received: by 2002:a17:906:1749:: with SMTP id d9mr15252796eje.178.1633339928725; Mon, 04 Oct 2021 02:32:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/5] target/xtensa: list cores in a text file Date: Mon, 4 Oct 2021 11:30:52 +0200 Message-Id: <20211004093053.87883-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004093053.87883-1-pbonzini@redhat.com> References: <20211004093053.87883-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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.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: 1633341857021100001 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 From nobody Mon Feb 9 03:17:07 2026 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 1633341151504507.6058885914447; Mon, 4 Oct 2021 02:52:31 -0700 (PDT) Received: from localhost ([::1]:43098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXKe5-0000kT-Pa for importer@patchew.org; Mon, 04 Oct 2021 05:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXKbV-0006O1-VJ for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:49:50 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:36652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXKbT-0001wG-0W for qemu-devel@nongnu.org; Mon, 04 Oct 2021 05:49:49 -0400 Received: by mail-ed1-x52d.google.com with SMTP id l7so38856115edq.3 for ; Mon, 04 Oct 2021 02:49:46 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id f4sm6264768ejf.61.2021.10.04.02.49.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 02:49:45 -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=Wx/PjAyfkj4ohI4PJ7Vi/Y2903RdRJzTnW/zD2NVT8Q=; b=HJCf+LZcSdCACyZOwcljutk4YkhhN1Ul94AVr+2ARfJWDa3wZdXZu7dbaGrpfEetVn xprfl/USgA5W+DQSUyKDqRM+NOXaqCwOFJAyfOaAViZUe0NFv0Vc16SfS+2M1s1Ho1v/ S+XXtux7+Wj3VkTXvD5I+oNMEjisJc6ykyeDAY8reNfaFH5j9dahC2iJqULN9fZLZcXr mlhx0AHqUjgpvVYya16TtwkyAf/zVcB41MqFdx0lpX6VBcfevu6AaXbCjJ8YYPmYg0ZZ MG38SHIDK53ztqT2YevpAEqOj1Ldztsvltp0gcN1K9pH2qw1OirB7vnmaq1F0re7y+H0 hGCw== 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=Wx/PjAyfkj4ohI4PJ7Vi/Y2903RdRJzTnW/zD2NVT8Q=; b=a1T22rNmfWO5VdOVM3ZhT3X9V4SQ3fRyUyIfgPx59YrtWIPQm3xA3V/2RtDXREPQZM RRhTSZlTonoelNEF1vMk7h4eYj8H0beFii7PHwuRA/qI/ESmS4MSX36RlN7qYrptV7Wc LfDhmC7jwQLPO+PJq2yA2eqdEb8aqH+EIvZaehUeKZOkJwuYlEPImFKLC7RU9dzfOE+I hUBfQxt+qDqIQ5hzmX8Sx6XYUlh6T+jNCd0hEDe40LK0CMFKIbQd+ZObO+eyhG1S5C0k HkA8I/bL6CidUK+pHZYPvZMaJErYdRpKvg6I7DD00KVeuyg/pCqF3vp4pgtDZunLFe44 H8UQ== X-Gm-Message-State: AOAM533WOpPPi74o/zZcbUP98QbcaXag40vKddlDSbc+koXfYUDkk4GX RKw4Y4efkXaJTKI53xgVsLNfJ/rQAA8= X-Google-Smtp-Source: ABdhPJxpJuRMcOdCNyOZpe2pNEMNWCOj5uOuD9x+EFiKpV0u84SiT4ZTiP14FyiZJR3msavbRtRHWQ== X-Received: by 2002:a17:906:d196:: with SMTP id c22mr15810788ejz.231.1633340985432; Mon, 04 Oct 2021 02:49:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/5] meson: show library versions in the summary Date: Mon, 4 Oct 2021 11:49:43 +0200 Message-Id: <20211004094943.92925-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004093053.87883-1-pbonzini@redhat.com> References: <20211004093053.87883-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: 1633341152712100001 Content-Type: text/plain; charset="utf-8" Meson 0.57 allows passing external programs and dependency objects to summary(). Use this to show library versions and paths in the summary. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 112 +++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 58 deletions(-) diff --git a/meson.build b/meson.build index 17e77fe4ef..7b596fdcd9 100644 --- a/meson.build +++ b/meson.build @@ -2859,13 +2859,13 @@ summary_info =3D {} summary_info +=3D {'git': config_host['GIT']} summary_info +=3D {'make': config_host['MAKE']} summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} -summary_info +=3D {'sphinx-build': sphinx_build.found()} +summary_info +=3D {'sphinx-build': sphinx_build} if config_host.has_key('HAVE_GDB_BIN') summary_info +=3D {'gdb': config_host['HAVE_GDB_BIN']} endif summary_info +=3D {'genisoimage': config_host['GENISOIMAGE']} if targetos =3D=3D 'windows' and config_host.has_key('CONFIG_GUEST_AGENT') - summary_info +=3D {'wixl': wixl.found() ? wixl.full_path() : = false} + summary_info +=3D {'wixl': wixl} endif if slirp_opt !=3D 'disabled' and 'CONFIG_SLIRP_SMBD' in config_host summary_info +=3D {'smbd': config_host['CONFIG_SMBD_COMMAND']} @@ -2956,7 +2956,7 @@ if get_option('cfi') summary_info +=3D {'CFI debug support': get_option('cfi_debug')} endif summary_info +=3D {'strip binaries': get_option('strip')} -summary_info +=3D {'sparse': sparse.found() ? sparse.full_path(= ) : false} +summary_info +=3D {'sparse': sparse} summary_info +=3D {'mingw32 support': targetos =3D=3D 'windows'} =20 # snarf the cross-compilation information for tests @@ -3028,19 +3028,19 @@ if have_block summary_info +=3D {'vvfat support': config_host.has_key('CONFIG_VVFA= T')} summary_info +=3D {'qed support': config_host.has_key('CONFIG_QED'= )} summary_info +=3D {'parallels support': config_host.has_key('CONFIG_PARA= LLELS')} - summary_info +=3D {'FUSE exports': fuse.found()} + summary_info +=3D {'FUSE exports': fuse} endif summary(summary_info, bool_yn: true, section: 'Block layer support') =20 # Crypto summary_info =3D {} summary_info +=3D {'TLS priority': config_host['CONFIG_TLS_PRIORITY']} -summary_info +=3D {'GNUTLS support': gnutls.found()} -summary_info +=3D {'GNUTLS crypto': gnutls_crypto.found()} -# TODO: add back version -summary_info +=3D {'libgcrypt': gcrypt.found()} -# TODO: add back version -summary_info +=3D {'nettle': nettle.found()} +summary_info +=3D {'GNUTLS support': gnutls} +if gnutls.found() + summary_info +=3D {' GNUTLS crypto': gnutls_crypto.found()} +endif +summary_info +=3D {'libgcrypt': gcrypt} +summary_info +=3D {'nettle': nettle} if nettle.found() summary_info +=3D {' XTS': xts !=3D 'private'} endif @@ -3052,76 +3052,72 @@ summary(summary_info, bool_yn: true, section: 'Cryp= to') # Libraries summary_info =3D {} if targetos =3D=3D 'darwin' - summary_info +=3D {'Cocoa support': cocoa.found()} + summary_info +=3D {'Cocoa support': cocoa} endif -# TODO: add back version -summary_info +=3D {'SDL support': sdl.found()} -summary_info +=3D {'SDL image support': sdl_image.found()} -# TODO: add back version -summary_info +=3D {'GTK support': gtk.found()} -summary_info +=3D {'pixman': pixman.found()} -# TODO: add back version -summary_info +=3D {'VTE support': vte.found()} -# TODO: add back version -summary_info +=3D {'slirp support': slirp_opt =3D=3D 'disabled' ? fals= e : slirp_opt} -summary_info +=3D {'libtasn1': tasn1.found()} -summary_info +=3D {'PAM': pam.found()} -summary_info +=3D {'iconv support': iconv.found()} -summary_info +=3D {'curses support': curses.found()} -# TODO: add back version -summary_info +=3D {'virgl support': virgl.found()} -summary_info +=3D {'curl support': curl.found()} -summary_info +=3D {'Multipath support': mpathpersist.found()} -summary_info +=3D {'VNC support': vnc.found()} +summary_info +=3D {'SDL support': sdl} +summary_info +=3D {'SDL image support': sdl_image} +summary_info +=3D {'GTK support': gtk} +summary_info +=3D {'pixman': pixman} +summary_info +=3D {'VTE support': vte} +summary_info +=3D {'slirp support': slirp_opt =3D=3D 'internal' ? slir= p_opt : slirp} +summary_info +=3D {'libtasn1': tasn1} +summary_info +=3D {'PAM': pam} +summary_info +=3D {'iconv support': iconv} +summary_info +=3D {'curses support': curses} +summary_info +=3D {'virgl support': virgl} +summary_info +=3D {'curl support': curl} +summary_info +=3D {'Multipath support': mpathpersist} +summary_info +=3D {'VNC support': vnc} if vnc.found() - summary_info +=3D {'VNC SASL support': sasl.found()} - summary_info +=3D {'VNC JPEG support': jpeg.found()} - summary_info +=3D {'VNC PNG support': png.found()} + summary_info +=3D {'VNC SASL support': sasl} + summary_info +=3D {'VNC JPEG support': jpeg} + summary_info +=3D {'VNC PNG support': png} endif -summary_info +=3D {'brlapi support': brlapi.found()} +summary_info +=3D {'brlapi support': brlapi} summary_info +=3D {'vde support': config_host.has_key('CONFIG_VDE')} summary_info +=3D {'netmap support': config_host.has_key('CONFIG_NETMAP= ')} summary_info +=3D {'Linux AIO support': config_host.has_key('CONFIG_LINUX_= AIO')} -summary_info +=3D {'Linux io_uring support': linux_io_uring.found()} -summary_info +=3D {'ATTR/XATTR support': libattr.found()} +summary_info +=3D {'Linux io_uring support': linux_io_uring} +summary_info +=3D {'ATTR/XATTR support': libattr} summary_info +=3D {'RDMA support': config_host.has_key('CONFIG_RDMA')} summary_info +=3D {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA= ')} summary_info +=3D {'fdt support': fdt_opt =3D=3D 'disabled' ? false = : fdt_opt} -summary_info +=3D {'libcap-ng support': libcap_ng.found()} -summary_info +=3D {'bpf support': libbpf.found()} +summary_info +=3D {'libcap-ng support': libcap_ng} +summary_info +=3D {'bpf support': libbpf} # TODO: add back protocol and server version summary_info +=3D {'spice support': config_host.has_key('CONFIG_SPICE'= )} -summary_info +=3D {'rbd support': rbd.found()} +summary_info +=3D {'rbd support': rbd} summary_info +=3D {'xfsctl support': config_host.has_key('CONFIG_XFS')} -summary_info +=3D {'smartcard support': cacard.found()} -summary_info +=3D {'U2F support': u2f.found()} -summary_info +=3D {'libusb': libusb.found()} -summary_info +=3D {'usb net redir': usbredir.found()} +summary_info +=3D {'smartcard support': cacard} +summary_info +=3D {'U2F support': u2f} +summary_info +=3D {'libusb': libusb} +summary_info +=3D {'usb net redir': usbredir} summary_info +=3D {'OpenGL support': config_host.has_key('CONFIG_OPENGL= ')} -summary_info +=3D {'GBM': gbm.found()} -summary_info +=3D {'libiscsi support': libiscsi.found()} -summary_info +=3D {'libnfs support': libnfs.found()} +summary_info +=3D {'GBM': gbm} +summary_info +=3D {'libiscsi support': libiscsi} +summary_info +=3D {'libnfs support': libnfs} if targetos =3D=3D 'windows' if config_host.has_key('CONFIG_GUEST_AGENT') summary_info +=3D {'QGA VSS support': config_host.has_key('CONFIG_QG= A_VSS')} summary_info +=3D {'QGA w32 disk info': config_host.has_key('CONFIG_QG= A_NTDDSCSI')} endif endif -summary_info +=3D {'seccomp support': seccomp.found()} -summary_info +=3D {'GlusterFS support': glusterfs.found()} +summary_info +=3D {'seccomp support': seccomp} +summary_info +=3D {'GlusterFS support': glusterfs} summary_info +=3D {'TPM support': config_host.has_key('CONFIG_TPM')} summary_info +=3D {'libssh support': config_host.has_key('CONFIG_LIBSSH= ')} -summary_info +=3D {'lzo support': lzo.found()} -summary_info +=3D {'snappy support': snappy.found()} -summary_info +=3D {'bzip2 support': libbzip2.found()} -summary_info +=3D {'lzfse support': liblzfse.found()} -summary_info +=3D {'zstd support': zstd.found()} +summary_info +=3D {'lzo support': lzo} +summary_info +=3D {'snappy support': snappy} +summary_info +=3D {'bzip2 support': libbzip2} +summary_info +=3D {'lzfse support': liblzfse} +summary_info +=3D {'zstd support': zstd} summary_info +=3D {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info +=3D {'libxml2': libxml2.found()} -summary_info +=3D {'capstone': capstone_opt =3D=3D 'disabled' ? f= alse : capstone_opt} -summary_info +=3D {'libpmem support': libpmem.found()} -summary_info +=3D {'libdaxctl support': libdaxctl.found()} -summary_info +=3D {'libudev': libudev.found()} +summary_info +=3D {'libxml2': libxml2} +summary_info +=3D {'capstone': capstone_opt =3D=3D 'internal' ? c= apstone_opt : capstone} +summary_info +=3D {'libpmem support': libpmem} +summary_info +=3D {'libdaxctl support': libdaxctl} +summary_info +=3D {'libudev': libudev} +# Dummy dependency, keep .found() summary_info +=3D {'FUSE lseek': fuse_lseek.found()} summary(summary_info, bool_yn: true, section: 'Dependencies') =20 --=20 2.31.1