Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Randy MacLeod <Randy.MacLeod@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Cc: <alex.kanavin@gmail.com>, <richard.purdie@linuxfoundation.org>
Subject: [PATCH] rust: conditionally copy tools like rustfmt
Date: Fri, 19 Aug 2022 19:29:10 -0700	[thread overview]
Message-ID: <20220820022910.173452-1-Randy.MacLeod@windriver.com> (raw)
In-Reply-To: <20220819072727.2236928-39-alex@linutronix.de>

For qemuppc/mips, rustfmt isn't being built so check
that it and related tools exist before copying them.
qemuppc/mips are not well-supported in the Rust world
but will work to get the build to fixed later.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
 meta/recipes-devtools/rust/rust_1.63.0.bb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust_1.63.0.bb b/meta/recipes-devtools/rust/rust_1.63.0.bb
index 3081cd5ef3..050f398794 100644
--- a/meta/recipes-devtools/rust/rust_1.63.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.63.0.bb
@@ -43,8 +43,10 @@ rust_do_install:class-nativesdk() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R
@@ -60,8 +62,10 @@ rust_do_install:class-target() {
 
     install -d ${D}${bindir}
     for i in cargo-clippy clippy-driver rustfmt; do
-        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
-        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        if [ -e build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ]; then
+            cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+            chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+        fi
     done
 
     chown root:root ${D}/ -R
-- 
2.35.1



  reply	other threads:[~2022-08-20  2:29 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-19  7:26 [PATCH 01/42] nfs-utils: upgrade 2.6.1 -> 2.6.2 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 02/42] tzdata: upgrade 2022a -> 2022b Alexander Kanavin
2022-08-19  7:26 ` [PATCH 03/42] libcgroup: update 2.0.2 -> 3.0.0 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 04/42] python3-setuptools-rust: update 1.4.1 -> 1.5.1 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 05/42] shadow: update 4.11.1 -> 4.12.1 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 06/42] slang: update 2.3.2 -> 2.3.3 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 07/42] xz: update 5.2.5 -> 5.2.6 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 08/42] gdk-pixbuf: update 2.42.8 -> 2.42.9 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 09/42] xorgproto: update 2022.1 -> 2022.2 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 10/42] boost-build-native: update 4.4.1 -> 1.80.0 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 11/42] boost: update 1.79.0 " Alexander Kanavin
2022-08-19  7:26 ` [PATCH 12/42] vulkan-samples: update to latest revision Alexander Kanavin
2022-08-19  7:26 ` [PATCH 13/42] epiphany: upgrade 42.3 -> 42.4 Alexander Kanavin
2022-08-19  7:26 ` [PATCH 14/42] git: upgrade 2.37.1 -> 2.37.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 15/42] glib-networking: upgrade 2.72.1 -> 2.72.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 16/42] gnu-efi: upgrade 3.0.14 -> 3.0.15 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 17/42] gpgme: upgrade 1.17.1 -> 1.18.0 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 18/42] libjpeg-turbo: upgrade 2.1.3 -> 2.1.4 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 19/42] libwebp: upgrade 1.2.3 -> 1.2.4 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 20/42] lighttpd: upgrade 1.4.65 -> 1.4.66 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 21/42] mesa: upgrade 22.1.5 -> 22.1.6 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 22/42] meson: upgrade 0.63.0 -> 0.63.1 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 23/42] mpg123: upgrade 1.30.1 -> 1.30.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 24/42] pango: upgrade 1.50.8 -> 1.50.9 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 25/42] piglit: upgrade to latest revision Alexander Kanavin
2022-08-19  7:27 ` [PATCH 26/42] pkgconf: upgrade 1.8.0 -> 1.9.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 27/42] python3-dtschema: upgrade 2022.8 -> 2022.8.1 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 28/42] python3-hypothesis: upgrade 6.54.1 -> 6.54.3 Alexander Kanavin
2022-08-19  8:09   ` [OE-core] " ChenQi
2022-08-19  8:15     ` Alexander Kanavin
2022-08-19  7:27 ` [PATCH 29/42] python3-more-itertools: upgrade 8.13.0 -> 8.14.0 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 30/42] python3-numpy: upgrade 1.23.1 -> 1.23.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 31/42] python3-pbr: upgrade 5.9.0 -> 5.10.0 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 32/42] python3-pyelftools: upgrade 0.28 -> 0.29 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 33/42] python3-pytz: upgrade 2022.1 -> 2022.2.1 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 34/42] strace: upgrade 5.18 -> 5.19 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 35/42] sysklogd: upgrade 2.4.2 -> 2.4.4 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 36/42] webkitgtk: upgrade 2.36.5 -> 2.36.6 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 37/42] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 38/42] wpebackend-fdo: upgrade 1.12.0 -> 1.12.1 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 39/42] rust: update from 1.62.1 to 1.63.0 Alexander Kanavin
2022-08-20  2:29   ` Randy MacLeod [this message]
2022-08-25  9:46     ` [PATCH] rust: conditionally copy tools like rustfmt Richard Purdie
2022-08-25 10:07       ` Alexander Kanavin
2022-08-19  7:27 ` [PATCH 40/42] python3-hatchling: update 1.6.0 -> 1.8.0 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 41/42] python3-setuptools: update 63.4.1 -> 65.0.2 Alexander Kanavin
2022-08-19  7:27 ` [PATCH 42/42] devtool: do not leave behind source trees in workspace/sources Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220820022910.173452-1-Randy.MacLeod@windriver.com \
    --to=randy.macleod@windriver.com \
    --cc=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox