From nobody Sat Nov 15 05:30:42 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=1754922674; cv=none; d=zohomail.com; s=zohoarc; b=LNRC+TIV0eX8FyY5w6DZtEmtiLCXbr600ZYHSmPCXcozgPbJv8fovVLLU7qCWEDan6wEmulpTiogvH+nO2y1SDLyFX7cEt4XHpmQrlZeZpjBFb9lWWxVKgpjIET5w3he/owF5RPH21MracqejX0SgPHmM7WPnp9LXGrF9KelYjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754922674; h=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=TUk+oxQqP3+1Tw1ir7+gMc1fhS/zGQAqfeWjeuFoIrM=; b=a77smrLhKZWT1EeBPuA2ie72JHTVw1JmNFWlV0sDdeDiFytInaKFUUDJleHwID0VQUpTxr1FNjJjh2cGssY9JSEkXJPo4XV++JfYgfBzqv8DQPXDaMQOPGzD6WM3OO1y2RV6zLKn812pLW3KYOSB61MjRAnc2JLko71Lcq172RE= 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 1754922674285357.72516552007255; Mon, 11 Aug 2025 07:31:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulTXS-0002Q5-P2; Mon, 11 Aug 2025 10:30:14 -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 1ulTX1-0002Iy-8S for qemu-devel@nongnu.org; Mon, 11 Aug 2025 10:29:49 -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 1ulTWw-0007N7-Pm for qemu-devel@nongnu.org; Mon, 11 Aug 2025 10:29:46 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-685-UZC_Oj-WPciD7xmtnY9mOw-1; Mon, 11 Aug 2025 10:29:36 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 92EED18002A0; Mon, 11 Aug 2025 14:29:35 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.44.33.151]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F7541955F24; Mon, 11 Aug 2025 14:29:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754922578; 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; bh=TUk+oxQqP3+1Tw1ir7+gMc1fhS/zGQAqfeWjeuFoIrM=; b=axCj7e8iIpXoftDjgjbnmHv9Q1mNzKrbrpBdcrXtKnwyzoybbNxAxKIxzIi4v246gvT8b3 mUewugGhjcQ1W5RoAIHyUr5bQIoUXmVwiwYjKOEB0FAOx06Rf8IbzrWbTi4G8gQREI41vC 5Te+geaJcAee2jw1EGi8JLpwtSRzvA0= X-MC-Unique: UZC_Oj-WPciD7xmtnY9mOw-1 X-Mimecast-MFC-AGG-ID: UZC_Oj-WPciD7xmtnY9mOw_1754922576 From: Kevin Wolf To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, manos.pitsidianakis@linaro.org, qemu-rust@nongnu.org Subject: [PATCH] configure: Don't disable Rust for too old meson version Date: Mon, 11 Aug 2025 16:29:23 +0200 Message-ID: <20250811142923.89983-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: 1754922677479124100 Content-Type: text/plain; charset="utf-8" If the user explicitly specified --enable-rust, don't just fail if meson is too old for Rust support, but do the same thing as if meson was too old for the C code: Just download a newer one. In order to avoid the additional download for people who aren't intentionally opting in to Rust, keep the automatic disabling based on the meson version as the default if neither --enable-rust nor --disable-rust were given. Signed-off-by: Kevin Wolf Reviewed-by: Paolo Bonzini --- configure | 8 +++++--- pythondeps.toml | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 825057ebf1..274a778764 100755 --- a/configure +++ b/configure @@ -1186,10 +1186,12 @@ fi 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" + $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ + ${source_path}/pythondeps.toml meson-rust || exit 1 + else + echo "Rust needs Meson 1.8.1, disabling" 2>&1 + rust=3Ddisabled 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") diff --git a/pythondeps.toml b/pythondeps.toml index b2eec940ce..d0f52b14f7 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -22,6 +22,10 @@ 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 +[meson-rust] +# The install key should match the version in python/wheels/ +meson =3D { accepted =3D ">=3D1.8.1", installed =3D "1.8.1", canary =3D "m= eson" } + [docs] # Please keep the installed versions in sync with docs/requirements.txt sphinx =3D { accepted =3D ">=3D3.4.3", installed =3D "6.2.1", canary =3D "= sphinx-build" } --=20 2.50.1