Skip to contentSkip to conversation

cargo: Do not use open64 on musl anymore

PATCH In review Khem Raj 3 participants 4 messages Dec 29, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 cargo: Do not use open64 on musl anymore

The same rust getrandom patch is needed for cargo on target as well as it uses the same crate

---
 meta/recipes-devtools/rust/cargo_1.66.0.bb                   | 5 ++++-
 .../rust/{rust => files}/getrandom-open64.patch              | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{rust => files}/getrandom-open64.patch (100%)
meta/recipes-devtools/rust/cargo_1.66.0.bb +4 -1
index 37e0123ee3..f45f8f1e12 100644
@@ -14,7 +14,10 @@ LIC_FILES_CHKSUM = " \
 require rust-source.inc
 require rust-snapshot.inc
 
-SRC_URI:append:class-target = " file://crossbeam_atomic.patch;patchdir=${RUSTSRC}"
+SRC_URI:append:class-target = "\
+    file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \
+    file://getrandom-open64.patch;patchdir=${RUSTSRC} \                          
+"
 
 # Used by crossbeam_atomic.patch
 export TARGET_VENDOR
meta/recipes-devtools/rust/files/getrandom-open64.patch renamed from meta/recipes-devtools/rust/rust/getrandom-open64.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust/getrandom-open64.patch
rename to meta/recipes-devtools/rust/files/getrandom-open64.patch
Signature · 1 line
2.39.0
#1 lore raw

Should we just move these patches to rust-source and apply them for everyone who consumes it?

Quoted 50 lines · On Thu, 29 Dec 2022, 19:09 Khem Raj, <[email protected]> wrote:

The same rust getrandom patch is needed for cargo on target as well as it uses the same crate

---
 meta/recipes-devtools/rust/cargo_1.66.0.bb                   | 5 ++++-
 .../rust/{rust => files}/getrandom-open64.patch              | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{rust => files}/getrandom-open64.patch

(100%)

meta/recipes-devtools/rust/cargo_1.66.0.bb +0 -1
index 37e0123ee3..f45f8f1e12 100644
@@ -14,7 +14,10 @@ LIC_FILES_CHKSUM = " \
 require rust-source.inc
 require rust-snapshot.inc
 
-SRC_URI:append:class-target = "

file://crossbeam_atomic.patch;patchdir=${RUSTSRC}"

meta/recipes-devtools/rust/cargo_1.66.0.bb +4 -0
+SRC_URI:append:class-target = "\
+    file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \
+    file://getrandom-open64.patch;patchdir=${RUSTSRC} \
 
+"
 
 # Used by crossbeam_atomic.patch
 export TARGET_VENDOR
meta/recipes-devtools/rust/files/getrandom-open64.patch renamed from meta/recipes-devtools/rust/rust/getrandom-open64.patch +0 -1
similarity index 100%
rename from meta/recipes-devtools/rust/rust/getrandom-open64.patch
rename to meta/recipes-devtools/rust/files/getrandom-open64.patch
--

2.39.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#175126):
https://lists.openembedded.org/g/openembedded-core/message/175126
Mute This Topic: https://lists.openembedded.org/mt/95942095/3618097
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#2 lore raw
Quoted 2 lines · Alex Kiernan

Should we just move these patches to rust-source and apply them for everyone who consumes it?

A common source will certainly be better however, we do not use shared workspace for rust recipes
so it does not matter as much.

Quoted 45 lines · On Thu, 29 Dec 2022, 19:09 Khem Raj, <[email protected]> wrote:
Quoted 43 lines

The same rust getrandom patch is needed for cargo on target as well as it uses the same crate

---
 meta/recipes-devtools/rust/cargo_1.66.0.bb                   | 5 ++++-
 .../rust/{rust => files}/getrandom-open64.patch              | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{rust => files}/getrandom-open64.patch (100%)
meta/recipes-devtools/rust/cargo_1.66.0.bb +4 -1
index 37e0123ee3..f45f8f1e12 100644
@@ -14,7 +14,10 @@ LIC_FILES_CHKSUM = " \
 require rust-source.inc
 require rust-snapshot.inc
 
-SRC_URI:append:class-target = " file://crossbeam_atomic.patch;patchdir=${RUSTSRC}"
+SRC_URI:append:class-target = "\
+    file://crossbeam_atomic.patch;patchdir=${RUSTSRC} \
+    file://getrandom-open64.patch;patchdir=${RUSTSRC} \
+"
 
 # Used by crossbeam_atomic.patch
 export TARGET_VENDOR
meta/recipes-devtools/rust/files/getrandom-open64.patch renamed from meta/recipes-devtools/rust/rust/getrandom-open64.patch +0 -1
similarity index 100%
rename from meta/recipes-devtools/rust/rust/getrandom-open64.patch
rename to meta/recipes-devtools/rust/files/getrandom-open64.patch
--

2.39.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175126): https://lists.openembedded.org/g/openembedded-core/message/175126
Mute This Topic: https://lists.openembedded.org/mt/95942095/3618097
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw
Quoted 7 lines · Khem Raj
Quoted 2 lines · Alex Kiernan

Should we just move these patches to rust-source and apply them for everyone who consumes it?

A common source will certainly be better however, we do not use shared workspace for rust recipes
so it does not matter as much.

I think this may be why cargo was failing in my test build. There were some other issues there too.

Cheers,

Richard