From nobody Wed Apr 1 22:03:13 2026 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=1773474953; cv=none; d=zohomail.com; s=zohoarc; b=doHFoy8VlFG5N/Jq5iJSJ13NaaIfHzP8TDMnIh9AonQx8U4ONPSneJgoyumqRXmp+MPvin0CvnOK42bazAzF5Vc0IAKhDp0T2VnDZjrFzmRCn2yLIyrx1ZY5NX5l9BANU1HYvSraybED2/s0RmJgpuOVS4//0IUs3ycyAm0Clyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773474953; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TqTVzb498TkVnC9aLaQQjICK5+qBmbLPUoLpPxKrTlA=; b=fkaIRazmPNXzF1ByIfFrGZQZunPMdjZ/Wi4lYc9VRd8k1GLKoT0Y1ZZv6Sv1l42hNDY5V/E7NQq4yTVkDMevfsV8jHgJ4k+3DpfS2AYAiKqtSCocV0kPBnabtyTtr9tP6/dpDkcIAmJi2nGD9Zgox/eZ1h9hfOTtmIqpB3JaRSo= 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 1773474953238821.03359667982; Sat, 14 Mar 2026 00:55:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w1Jq5-0007rm-Fa; Sat, 14 Mar 2026 03:55:13 -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 1w1Jq3-0007rP-N9 for qemu-devel@nongnu.org; Sat, 14 Mar 2026 03:55:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w1Jq0-00070Y-D6 for qemu-devel@nongnu.org; Sat, 14 Mar 2026 03:55:11 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-488-eURO-aI6O02a9YCiMTMiUQ-1; Sat, 14 Mar 2026 03:55:04 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-439c112b1a4so1971435f8f.3 for ; Sat, 14 Mar 2026 00:55:03 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe19abbasm22765168f8f.6.2026.03.14.00.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2026 00:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773474906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TqTVzb498TkVnC9aLaQQjICK5+qBmbLPUoLpPxKrTlA=; b=eYSvixzJjy+awr9bWMsq7IL6D9RWD0JmcoA2KMNNxuKrXjNiiodNF3tH/NztDxJp2c6bbi BNG/Pl83Xr1Re/laZ6rDbYGwX4Re9Txm1TZDvFq/G7/zMpkFZljLMP8ydzfxKWe8tZPkPl oANsQ44ewDpQkJPMQpk2W60tlqY2jss= X-MC-Unique: eURO-aI6O02a9YCiMTMiUQ-1 X-Mimecast-MFC-AGG-ID: eURO-aI6O02a9YCiMTMiUQ_1773474903 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773474902; x=1774079702; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TqTVzb498TkVnC9aLaQQjICK5+qBmbLPUoLpPxKrTlA=; b=VPme5Op4aCX0tG/1HvmJj8mWdtsHoKLMGT5QJKctiialDh4+IuX0T7BU1RuFTnoB68 tGlXBwGoNqfaqbWtRjNGvcRmitS2N5lFFHe+YsWYT5WuXBsOewNoEHYLQu5Xmz5TT2vu N9qHuzNEx+m26EHpko1qpgkSSH6DyyHjMQK85T87jupOREb+ptCdu6dff6l6fPv7aZnO G1nGEKtf0QrvZdxF4Gwd3X9UMn7+4G96a4ad10Oal5/xu6chzOGkVtpoUVK02JWZ9z7R 5vYH+iLwuFrPs4uf6yY2GPsrH2ne6OZNWLIyvsdaTvGjJ/qv2arZHMzeSXdofzMuhz6e 8xYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773474902; x=1774079702; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TqTVzb498TkVnC9aLaQQjICK5+qBmbLPUoLpPxKrTlA=; b=hDTVBQtFzYozqv5Ng3WF8n/fV63iX6MVfFRUNi59tIg+pUt/Au7Ae4oGo8w6xqx2OX xkABfmV5Lf7DfLRlc1jo5wkzYYddMdzmEGkM9v3Qrizk73fL+tCt4CUJfUiN8ugJot3h gDamRYTZl9QeE2cGesBkO6zN/S6Lc1ORvVKg0Kn635AokdNTj6QI2p5JzRzWlBFG4AU6 WgYtjY1nULVW7u3HLKw36wfVD7bCwCsSFwSwCfbqz356qyqBZVemkpT9mEvHbfuHBdKM /vm2ZmHqDTG5c+lz4na34DsnplhvwdjNUpWK0/A/nvJBipQNwLoGckwO1doa1koNYgYr nNDQ== X-Gm-Message-State: AOJu0YwWd80d7yJsYYvtWE83Pm8zrpbphbDD8WjVDP5PIb+b2CfIw3Fp /hzb1agr2HGGGldoEaHcyuLMOPG9deP0tqwv/F5BHfKNk9z6esLRD+nSFrAXDorZY4+iLVdRfoc kLhCK3o9JfPBCUE9bxebqIAAuK/sK/usFtyix0M0ZcB5z9OOqUH7DuYTxvFFQPULKVFrWvYP4XE v0a8RkmLtIaRWsw+d9CbnY7D0Wayt/v04wVhX3IOdr X-Gm-Gg: ATEYQzzhb4/qr5cJ4MdrPPYVUIfVhnBCs1bqtKeibWIjuINZRz0eO2VOHHEP5udZ8vR ZtEgLtYdrVjeIDhsECT4FiJBP7mLFM06zu9u7+l8I7rg6jYtpSltbW8RTlV8slHb/yc0nnPLdG+ bTOXWtlQjfJqbWzvXhjluL1t4wDCXnniW1DIjSKEZPoAdDWkFDfAtXaq2Mf4IsU2cc1KRybl044 82UJkl5XVMg0sZ7G9h2kNrWE3xnV680iVkqQ0Q9otOJpO3AQPd6vqtVSjrd1vviKAcWKC3QJ9Ls UAuyrRbV1IshLzFIjajBNJ5kE8/AFvswFMvYvH/Xamk3pfarDur59ZpavB1XSIUUMSP0qunj4F+ EeEWI7dzkcuCG8PccV/Vh+d3JUoJL9Ief0DsQeuNjQ2BpaYhZxIExAf2kEySb6nvkCeS1C9jpYS 549zWY0G6Nu/swP5XBlFPFlxB5lGs= X-Received: by 2002:a05:600c:4f54:b0:485:3b5b:eb8 with SMTP id 5b1f17b1804b1-485567052b8mr96359345e9.26.1773474901958; Sat, 14 Mar 2026 00:55:01 -0700 (PDT) X-Received: by 2002:a05:600c:4f54:b0:485:3b5b:eb8 with SMTP id 5b1f17b1804b1-485567052b8mr96358965e9.26.1773474901403; Sat, 14 Mar 2026 00:55:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2] rust: fix build when --disable-rust and meson < 1.9 Date: Sat, 14 Mar 2026 08:55:00 +0100 Message-ID: <20260314075500.215628-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development 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: 1773474955011154100 Commit e65030ed50ee moved rust_std and build.rust_std from per-target override_options into the project's default_options, in order to avoid repetition. However, default_options are validated unconditionally at project initialization, even when Rust is disabled. This breaks builds with meson < 1.9.0 which does not know about "build.rust_std": meson.build:1:0: ERROR: Unknown option: "build.rust_std". Make the options conditional on the meson version, since Rust only supports new versions of Meson anyway. Fixes: e65030ed50ee ("rust: remove unnecessary repetitive options") Reported-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 11139f540b0..00f482d3fa6 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,11 @@ project('qemu', ['c'], meson_version: '>=3D1.5.0', default_options: ['warning_level=3D1', 'c_std=3Dgnu11', 'cpp_std= =3Dgnu++23', 'b_colorout=3Dauto', - 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue', - 'rust_std=3D2021', 'build.rust_std=3D2021'], + 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue'] + + + # build.rust_std breaks with older meson, but Ru= st does not + # support old meson anyway + (meson.version().version_compare('>=3D 1.9') ? [= 'rust_std=3D2021', 'build.rust_std=3D2021'] : ''), + version: files('VERSION')) =20 add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: = true, --=20 2.53.0