From nobody Sat Nov 15 19:02:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748365534; cv=none; d=zohomail.com; s=zohoarc; b=Zcrz1yivbfKyDhKKKkD6NLOQMzyd+uBJAjN7hLUgGXwHD/lbSRTcHZEDxT+e7MBEsyBKS9mhlj/E0QNhx9ZURWAl8lA3RhlNI577DBt8mbwFHSeuz7ozhArEZpG8DEHJGjoHFO4QeQGCfW8wOmS1MwKJPx7vcMvvGkC924Rkjpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748365534; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V4aZkVQe1X/Spfd9+OxNGkT/25sWGd8bXwBhMt/jceI=; b=SQWiHLMENmxxjuywLRFUDPa4e+2byqIpgy4+iWXRg1jwQdtnnj9oExGY2nMLow8lx4vs1EOo2fjFDePI5eSCAr+EsTU0qdzVifO+jERO5co3iMvX2IXdUqtSVPYeuAh5ApPpq9RAiKEVwSbT7Trxq2t5VkF46UnmxPVH/OtWTRg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174836553497228.159489907378997; Tue, 27 May 2025 10:05:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJxiu-0005dP-6P; Tue, 27 May 2025 13:04:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJxir-0005cQ-2k for qemu-devel@nongnu.org; Tue, 27 May 2025 13:04:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJxim-0006fv-RI for qemu-devel@nongnu.org; Tue, 27 May 2025 13:04:16 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-RMLwduUZNyaQ_qGidiggBw-1; Tue, 27 May 2025 13:04:09 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6045875e52fso2205767a12.2 for ; Tue, 27 May 2025 10:04:09 -0700 (PDT) Received: from [192.168.122.1] ([151.95.46.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6004d4f1be3sm18224012a12.5.2025.05.27.10.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 10:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748365451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V4aZkVQe1X/Spfd9+OxNGkT/25sWGd8bXwBhMt/jceI=; b=hdUVFvmhojavaqhx4XkCf5MDpxsbvBELuAEW3cY3w4k1dcWO4z2WVJCEJljXoF8SGJxrfr DLRkirMQ+SpLgvIjAiVCTtyKJQiIC1d8h0/+gpNfS1tEo2cHLQM0CP8dANzXvKS0kefmHo ZhjsmLEC3VASTMJn8V/v84filr4QI80= X-MC-Unique: RMLwduUZNyaQ_qGidiggBw-1 X-Mimecast-MFC-AGG-ID: RMLwduUZNyaQ_qGidiggBw_1748365448 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748365447; x=1748970247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V4aZkVQe1X/Spfd9+OxNGkT/25sWGd8bXwBhMt/jceI=; b=D2k787cDL4Y+/Z+GBVRzauRe88WRjR6yJgOiVAkO6IUv3i9oPkSSu+T1Af12lvrmRp KWhu+pTEs0xLxUgBDbF7H716OhsLxZ2vVIS2RgFHKnFsb5sE5LMjmlvYiH7Gs11GnvZX 1XXV9fZ+M3cmKYtjsZVw5SlB1YDVb1CAUBQZlER7rrqkZzxb/VGHwmkFki5YuTnXUlWc WN1jDA8mN18KqbRChZCp+CO0uk1WVkOdR7RvgjOl7x2ZpfTAybDxOWL9kVNFAROxutS/ 9HhcqsrsIkd3MPVD3NP6rUoFGPfbYscPzL7PlAYKqz7NlgrCJkeghZhoSjQdRW5x0ykt HoYQ== X-Gm-Message-State: AOJu0Yy60DdlXlmncGUG1ja4Jlu2LUrXPr7QrGjhzYfyOzNpvALyecua upJ72Pp+3xeFCcz0+E0pXfnfialgGqeX8hZX+t1ID9Qtk1cewBah2ifsc4PB0dSaVKm7HFoipAq Djk1Uaz76jVzviwHxwpnc+xXOcGgHxLMVFXwhZkZjwHWCLtiikcD1Wi1prDfzZ7oUm10XTDsGGH C2J7gNUYZHDZWTNdRS0u6il/CqqPfRUvVxza3ow6iV X-Gm-Gg: ASbGncukvmIxCgVBDx6ux2WErU9mCA6Tf4SlVpZ++xZYl7DjFvZhwDy54SoJiaFkJR1 3Xabq9GqoLBdhtFwouL5QEUjCepG0H/4Bmv3y6lg24fjxDM8kfztH/VrmAwjaqf/9UF+hYFoAZj N6R/ZXRil4X083wiYI2TRui4mPm+9AcXuMpyS2xX8RisgSJ68ZfZchJQ/zcqLjtN8xZo4paE3Wf lZCWMXzL0sRpQf6PfAqzMnvAQHYlWl3Nk72oIJ15e+SNupOOQLAe2Ra/Qk6Mw3o3VCJgIsR85Wo T41jUmsy85g4bw== X-Received: by 2002:a05:6402:34c1:b0:5fb:ad3c:cee9 with SMTP id 4fb4d7f45d1cf-602da8dde73mr11271226a12.28.1748365447540; Tue, 27 May 2025 10:04:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4LoKixDs5J+EI0OHKMItBHRlzlXmw17NtWfbttHNL5Snhm9R4B2QVYPR7W+KOFFeLnT+0Ow== X-Received: by 2002:a05:6402:34c1:b0:5fb:ad3c:cee9 with SMTP id 4fb4d7f45d1cf-602da8dde73mr11271170a12.28.1748365447044; Tue, 27 May 2025 10:04:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 1/6] meson: update to version 1.8.1 Date: Tue, 27 May 2025 19:03:59 +0200 Message-ID: <20250527170404.1580482-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527170404.1580482-1-pbonzini@redhat.com> References: <20250527170404.1580482-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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.907, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748365536357116600 Content-Type: text/plain; charset="utf-8" This adds several improvements to Rust support, including native clippy and rustdoc targets, the "objects" keyword, and running doctests. Require it only when Rust support is requested, to avoid putting a strict requirement on all build platforms for the sake of an experimental feature. Signed-off-by: Paolo Bonzini --- configure | 8 ++++++++ python/scripts/vendor.py | 4 ++-- python/wheels/meson-1.5.0-py3-none-any.whl | Bin 959846 -> 0 bytes python/wheels/meson-1.8.1-py3-none-any.whl | Bin 0 -> 1013001 bytes pythondeps.toml | 2 +- tests/lcitool/mappings.yml | 6 +++++- 6 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 python/wheels/meson-1.5.0-py3-none-any.whl create mode 100644 python/wheels/meson-1.8.1-py3-none-any.whl diff --git a/configure b/configure index 2ce8d29fac2..74b3865e51e 100755 --- a/configure +++ b/configure @@ -1178,6 +1178,14 @@ fi ########################################## # detect rust triple =20 +meson_version=3D$($meson --version) +if test "$rust" !=3D disabled && ! version_ge "$meson_version" 1.8.1; then + if test "$rust" =3D enabled; then + error_exit "Rust support needs Meson 1.8.1 or newer" + fi + echo "Rust needs Meson 1.8.1, disabling" 2>&1 + rust=3Ddisabled +fi if test "$rust" !=3D disabled && has "$rustc" && $rustc -vV > "${TMPDIR1}/= ${TMPB}.out"; then rust_host_triple=3D$(sed -n 's/^host: //p' "${TMPDIR1}/${TMPB}.out") else diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 0405e910b48..b47db00743a 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() =20 packages =3D { - "meson=3D=3D1.5.0": - "52b34f4903b882df52ad0d533146d4b992c018ea77399f825579737672ae7b20", + "meson=3D=3D1.8.1": + "374bbf71247e629475fc10b0bd2ef66fc418c2d8f4890572f74de0f97d0d42da", } =20 vendor_dir =3D Path(__file__, "..", "..", "wheels").resolve() diff --git a/pythondeps.toml b/pythondeps.toml index 7eaaa0fed10..7884ab521d1 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ =20 [meson] # The install key should match the version in python/wheels/ -meson =3D { accepted =3D ">=3D1.5.0", installed =3D "1.5.0", canary =3D "m= eson" } +meson =3D { accepted =3D ">=3D1.5.0", installed =3D "1.8.1", canary =3D "m= eson" } pycotap =3D { accepted =3D ">=3D1.1.0", installed =3D "1.3.1" } =20 [docs] diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 673baf39367..8f0e95e1c56 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -8,6 +8,10 @@ mappings: =20 meson: OpenSUSELeap15: + # Use Meson from PyPI wherever Rust is enabled + Debian: + Fedora: + Ubuntu: =20 python3: OpenSUSELeap15: python311-base @@ -72,7 +76,7 @@ mappings: pypi_mappings: # Request more recent version meson: - default: meson=3D=3D1.5.0 + default: meson=3D=3D1.8.1 =20 # Drop packages that need devel headers python3-numpy: --=20 2.49.0