From patchwork Wed May 21 19:14:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 63484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D2DEC54E90 for ; Wed, 21 May 2025 19:15:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.7296.1747854898822614692 for ; Wed, 21 May 2025 12:14:59 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 492F014BF for ; Wed, 21 May 2025 12:14:44 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C11B13F673 for ; Wed, 21 May 2025 12:14:57 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] rust: remove python3-native DEPENDS Date: Wed, 21 May 2025 20:14:47 +0100 Message-ID: <20250521191449.1486927-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 May 2025 19:15:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217055 This dependency has always existed in the oe-core recipes but isn't explicitly needed here: the host Python is sufficient. Note that rust-common still inherits on python3native[1] so this doesn't yet actually have a meaningful change to the dependency tree. [1] oe-core 4abd6ee9d48 ("rust-common.bbclass: rewrite toolchain wrappers in (native) python") Signed-off-by: Ross Burton --- meta/recipes-devtools/rust/rust_1.85.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rust/rust_1.85.1.bb b/meta/recipes-devtools/rust/rust_1.85.1.bb index dc4f5648552..583437f1f3e 100644 --- a/meta/recipes-devtools/rust/rust_1.85.1.bb +++ b/meta/recipes-devtools/rust/rust_1.85.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7" inherit rust inherit cargo_common -DEPENDS += "file-native python3-native" +DEPENDS += "file-native" DEPENDS:append:class-native = " rust-llvm-native" DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" From patchwork Wed May 21 19:14:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 63485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C452C2D0CD for ; Wed, 21 May 2025 19:15:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.7166.1747854899188126107 for ; Wed, 21 May 2025 12:14:59 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EB3FF1515 for ; Wed, 21 May 2025 12:14:44 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 714853F673 for ; Wed, 21 May 2025 12:14:58 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] rust: consolidate rust-llvm dependencies Date: Wed, 21 May 2025 20:14:48 +0100 Message-ID: <20250521191449.1486927-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250521191449.1486927-1-ross.burton@arm.com> References: <20250521191449.1486927-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 May 2025 19:15:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217056 There's no need to have multiple overrides for this, as BBCLASSEXTEND will automatically map the dependencies as needed. Signed-off-by: Ross Burton --- meta/recipes-devtools/rust/rust_1.85.1.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.85.1.bb b/meta/recipes-devtools/rust/rust_1.85.1.bb index 583437f1f3e..6411e43c961 100644 --- a/meta/recipes-devtools/rust/rust_1.85.1.bb +++ b/meta/recipes-devtools/rust/rust_1.85.1.bb @@ -7,17 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7" inherit rust inherit cargo_common -DEPENDS += "file-native" -DEPENDS:append:class-native = " rust-llvm-native" -DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" - +DEPENDS += "file-native rust-llvm" # native rust uses cargo/rustc from binary snapshots to bootstrap # but everything else should use our native builds DEPENDS:append:class-target = " cargo-native rust-native" DEPENDS:append:class-nativesdk = " cargo-native rust-native" -DEPENDS += "rust-llvm (=${PV})" - RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" # Otherwise we'll depend on what we provide From patchwork Wed May 21 19:14:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 63486 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65CD0C54E71 for ; Wed, 21 May 2025 19:15:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.7168.1747854899876719001 for ; Wed, 21 May 2025 12:14:59 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9BD0814BF for ; Wed, 21 May 2025 12:14:45 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 22E153F673 for ; Wed, 21 May 2025 12:14:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] rust: remove file-native DEPENDS Date: Wed, 21 May 2025 20:14:49 +0100 Message-ID: <20250521191449.1486927-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250521191449.1486927-1-ross.burton@arm.com> References: <20250521191449.1486927-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 May 2025 19:15:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217057 It's unclear what this was for: there's no use of "file" or libmagic in the recipe, and the guide to building Rust from source doesn't list file as a dependency[1]. [1] https://github.com/rust-lang/rust/blob/master/INSTALL.md#dependencies Signed-off-by: Ross Burton --- meta/recipes-devtools/rust/rust_1.85.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rust/rust_1.85.1.bb b/meta/recipes-devtools/rust/rust_1.85.1.bb index 6411e43c961..a4a2c69d9d8 100644 --- a/meta/recipes-devtools/rust/rust_1.85.1.bb +++ b/meta/recipes-devtools/rust/rust_1.85.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7" inherit rust inherit cargo_common -DEPENDS += "file-native rust-llvm" +DEPENDS += "rust-llvm" # native rust uses cargo/rustc from binary snapshots to bootstrap # but everything else should use our native builds DEPENDS:append:class-target = " cargo-native rust-native"