[RFC,8/8] rust: Introduce RUST_BUILD_ARCH

Message ID	20220222035234.463162-9-andrew@aj.id.au
State	Accepted, archived
Commit	c13afbade8d480807b9de70c56dcd650496f06b2
Headers	show Return-Path: <andrew@aj.id.au> ip: 66.111.4.29, mailfrom: andrew@aj.id.au) From: Andrew Jeffery <andrew@aj.id.au> To: openembedded-core@lists.openembedded.org Subject: [RFC PATCH 8/8] rust: Introduce RUST_BUILD_ARCH Date: Tue, 22 Feb 2022 14:22:34 +1030 Message-Id: <20220222035234.463162-9-andrew@aj.id.au> In-Reply-To: <20220222035234.463162-1-andrew@aj.id.au> References: <20220222035234.463162-1-andrew@aj.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	rust: Fix powerpc64le support \| expand [RFC,0/8] rust: Fix powerpc64le support [RFC,1/8] rust: Migrate arch_to_rust_target_arch() to rust-common class [RFC,2/8] rust: Rename arch_to_rust_target_arch() for generality [RFC,3/8] rust: Handle Power arch variants in arch_to_rust_arch() [RFC,4/8] rust: Consistently use RUST_{BUILD,HOST,TARGET}_{ARCH,SYS} [RFC,5/8] rust: libstd-rs: Install deps under {RUST_,}TARGET_SYS mismatch [RFC,6/8] rust: Mitigate duplicate sections on matching architectures [RFC,7/8] rust: Add snapshot checksums for powerpc64le [RFC,8/8] rust: Introduce RUST_BUILD_ARCH

Message ID

20220222035234.463162-9-andrew@aj.id.au

State

Accepted, archived

Commit

c13afbade8d480807b9de70c56dcd650496f06b2

Headers

From: Andrew Jeffery <andrew@aj.id.au>
To: openembedded-core@lists.openembedded.org
Subject: [RFC PATCH 8/8] rust: Introduce RUST_BUILD_ARCH
Date: Tue, 22 Feb 2022 14:22:34 +1030
Message-Id: <20220222035234.463162-9-andrew@aj.id.au>
In-Reply-To: <20220222035234.463162-1-andrew@aj.id.au>
References: <20220222035234.463162-1-andrew@aj.id.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

rust: Fix powerpc64le support | expand

Commit Message

Andrew Jeffery Feb. 22, 2022, 3:52 a.m. UTC

On modern Power systems `uname -m` yields 'ppc64le' while the toolchain
knows the architecture as 'powerpc64le'. Provide a mapping from one to
the other to download the correct snapshot artifacts.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
 meta/classes/rust-common.bbclass             |  3 +++
 meta/recipes-devtools/rust/rust-snapshot.inc | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index 58ece01097c8..2ee7e178e536 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -107,6 +107,9 @@  def rust_base_triple(d, thing):
         libc = bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hf', '', d)
     return arch + vendor + '-' + os + libc
 
+# In some cases uname and the toolchain differ on their idea of the arch name
+RUST_BUILD_ARCH = "${@arch_to_rust_arch(d.getVar('BUILD_ARCH'))}"
+
 # Naming explanation
 # Yocto
 # - BUILD_SYS - Yocto triple of the build environment
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc
index d6ffe92d07ee..d0c05aec7866 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -19,11 +19,11 @@  SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "f43cb99109c3438c77c7079cdce4673
 SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "599cf1b5a8cdbf76d591621bc9222aefa60e2f5fd378ae71c4dcf4514c47122e"
 
 SRC_URI += " \
-    https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-    https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-    https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
+    https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
+    https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
+    https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
 "
 
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
+RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"

[RFC,8/8] rust: Introduce RUST_BUILD_ARCH

Commit Message

Patch