Bruce Leidl
3db0a6b032
poky: Upgrade to Yocto 4.1 Langdale meta-citadel/recipes-kernel: citadel-kernel 5.19.9 -> 6.0.8 meta-citadel/recipes-sway: sway 1.5.1 -> 1.7 (meta-wayland) wlroots 0.12.0 -> 0.15.1 (meta-wayland) meta-gnome/recipes-connectivity: iwd 1.27 -> 1.30 (meta-oe) modemmanager 1.18.2 -> 1.18.6 (meta-oe) networkmanager 1.36.2 -> 1.40.0 (meta-oe) meta-gnome/recipes-freedesktop: libgusb 0.3.7 -> 0.3.10 (meta-oe) meta-gnome/recipes-gnome: adwaita-icon-theme 42 -> 43 (oe-core) geocode-glib 3.26.2 -> 3.26.4 (meta-oe) gjs 1.72.0 -> 1.73.2 (meta-oe) gnome-bluetooth 42.0 -> 42.4 (meta-oe) gnome-control-center 42.1 -> 43.0 gnome-desktop 42.1 -> 43.rc gnome-settings-daemon 42.1 -> 43.0 gnome-shell 42.1 -> 43.0 gsettings-desktop-schema 41.0 -> 43.0 gtk4 4.6.4 -> 4.6.7 (meta-oe) gvfs 1.50.0 -> 1.50.2 (meta-oe) libadwaita 1.1.1 -> 1.2.0 (meta-oe) libgee 0.20.4 -> 0.20.6 (meta-oe) mutter 42.1 -> 43.0 rest 0.8.1 -> 0.9.0 (meta-oe) meta-gnome/recipes-support: ell 0.50 -> 0.53 (poky) exiv2 0.26 -> 0.27.3 (meta-oe) graphene 1.10.2 -> 1.10.8 (meta-oe) gsound 1.0.2 -> 1.0.3 (meta-oe) icu_71.1 (removed from meta-gnome because this version is in poky) jansson 2.12 -> 2.14 (meta-oe) lcms 2.9 -> 2.14 (meta-oe) libdvdread 6.1.1 -> 6.1.3 (meta-oe) libndp 1.6 -> 1.8 (meta-oe) mozjs 91.8.0 -> 102.3.0 power-profiles-daemon 0.12 (new-recipe)
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 129835dbbee86723b3778027026f8df94f40c671 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
|
Date: Fri, 1 Oct 2021 13:02:17 +0200
|
|
Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
|
|
|
|
OE is using custom targets and so this is bound to fail.
|
|
|
|
Upstream-Status: Inapppropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
|
|
---
|
|
build/moz.configure/rust.configure | 34 ++----------------------------
|
|
1 file changed, 2 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
|
|
index e64dc5d5ec..edf21baca6 100644
|
|
--- a/build/moz.configure/rust.configure
|
|
+++ b/build/moz.configure/rust.configure
|
|
@@ -471,33 +471,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
|
|
def rust_host_triple(
|
|
rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target
|
|
):
|
|
- rustc_target = detect_rustc_target(
|
|
- host, compiler_info, arm_target, rust_supported_targets
|
|
- )
|
|
- if rustc_target != rustc_host:
|
|
- if host.alias == rustc_target:
|
|
- configure_host = host.alias
|
|
- else:
|
|
- configure_host = "{}/{}".format(host.alias, rustc_target)
|
|
- die(
|
|
- dedent(
|
|
- """\
|
|
- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
|
|
-
|
|
- You can solve this by:
|
|
- * Set your configure host to match the rust compiler host by editing your
|
|
- mozconfig and adding "ac_add_options --host={rustc}".
|
|
- * Or, install the rust toolchain for {configure}, if supported, by running
|
|
- "rustup default stable-{rustc_target}"
|
|
- """.format(
|
|
- rustc=rustc_host,
|
|
- configure=configure_host,
|
|
- rustc_target=rustc_target,
|
|
- )
|
|
- )
|
|
- )
|
|
- assert_rust_compile(host, rustc_target, rustc)
|
|
- return rustc_target
|
|
+ return rustc_host
|
|
|
|
|
|
@depends(
|
|
@@ -507,11 +481,7 @@ def rust_host_triple(
|
|
def rust_target_triple(
|
|
rustc, target, compiler_info, rust_supported_targets, arm_target
|
|
):
|
|
- rustc_target = detect_rustc_target(
|
|
- target, compiler_info, arm_target, rust_supported_targets
|
|
- )
|
|
- assert_rust_compile(target, rustc_target, rustc)
|
|
- return rustc_target
|
|
+ return target.alias
|
|
|
|
|
|
set_config("RUST_TARGET", rust_target_triple)
|