mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-23 08:48:24 +00:00
mozjs-140: Backport libc fix to declare getrandom on all musl targets
The vendored libc 0.2.171 crate declares getrandom() for musl only on some architectures, so the vendored getrandom crate fails to build for riscv32 musl: error[E0425]: cannot find value `getrandom` in crate `libc` Backport the libc 0.2.172 change that declares it for all musl targets, and update the vendored crate checksums of the modified files. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
2 files changed
+89
No files matched your search
+88
@@ -0,0 +1,88 @@
|
|||||||
|
From: Khem Raj <khem.raj@oss.qualcomm.com>
|
||||||
|
Date: Wed, 21 Oct 2026 16:00:00 -0700
|
||||||
|
Subject: [PATCH] libc: Enable getrandom on all musl platforms
|
||||||
|
|
||||||
|
The vendored libc 0.2.171 declares getrandom() for musl only on arm,
|
||||||
|
x86, powerpc and 64-bit targets, so the vendored getrandom crate fails
|
||||||
|
to build for riscv32 musl:
|
||||||
|
|
||||||
|
error[E0425]: cannot find value `getrandom` in crate `libc`
|
||||||
|
--> third_party/rust/getrandom/src/backends/linux_android_with_fallback.rs:34:39
|
||||||
|
|
||||||
|
Backport the libc change that declares it for all musl targets, as all
|
||||||
|
of them now use a musl new enough to provide it, and update the vendored
|
||||||
|
crate checksums of the modified files. It is in libc 0.2.172 and later.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://github.com/rust-lang/libc/commit/77d301184110ec08defe78b4ba08450072eb5fb5]
|
||||||
|
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
|
||||||
|
---
|
||||||
|
third_party/rust/libc/.cargo-checksum.json | 2 +-
|
||||||
|
third_party/rust/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs | 4 ----
|
||||||
|
third_party/rust/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs | 4 ----
|
||||||
|
third_party/rust/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs | 4 ----
|
||||||
|
third_party/rust/libc/src/unix/linux_like/linux/musl/b64/mod.rs | 4 ----
|
||||||
|
third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs | 3 +++
|
||||||
|
6 files changed, 4 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
--- a/third_party/rust/libc/.cargo-checksum.json
|
||||||
|
+++ b/third_party/rust/libc/.cargo-checksum.json
|
||||||
|
@@ -1 +1 @@
|
||||||
|
-{"files":{"CHANGELOG.md":"747b437db48b8ded620a8738f9c1dbc2fde3d26db03d0782796537a9e505a263","CONTRIBUTING.md":"155e7f4e96fafe9ee5c8adb5068be27a22de89a95ca9bfc7baf517b9850d20d6","Cargo.lock":"8f6d0b13c977c8016b568c0a35b5ae709318e0766af3cff4a84d351219013841","Cargo.toml":"7f31f2e612b4c14b57ecdcec4912ac1514e26e3c061d5b06b54e1e34e83191b1","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"a198be444453fe0b24d4fb6a8b732eb9e6dc77ebcfd119fca95b97b45c77c77a","build.rs":"199eb63f03c4e90cad31c1f03a15bac3d81ca97f31bcb81c45bbd0d909e57d61","rustfmt.toml":"e9321ff995242e8cb0a4984254f0748ef11a89ca4618cab8f047ee59a88768e7","src/fuchsia/aarch64.rs":"9cd032304a54321a8926cf3157194c5d79a2491b1b974a05fe71729fa43b5738","src/fuchsia/mod.rs":"e27680db23fa506e379a86033b42813ea1f6c8f6b01d97a9a880d9d7be6d9f7f","src/fuchsia/riscv64.rs":"f2aba92cb88480bd72a9eb7a41aafc63c5db293b93113fa973fe5ab1fd819e29","src/fuchsia/x86_64.rs":"66c6ae7d3f81b1d7c962671aa074d709c39069e3b5830621a26d94c15caf588f","src/hermit.rs":"e414a3ecd5b5bc6c0bf7ce7c31639805943b789fbbf6006ceeb85ab44f3e4564","src/lib.rs":"d65975abfeac27f8dbef348fa7afa0b2b761a0a7073f4621c1bbff41334983cd","src/macros.rs":"076f328df1d51017bac70456e7b8290bee1b07390328fff48102e05048ada56a","src/primitives.rs":"0096ec3f32454a630fd1e78fa5aaaa033f107c1394a0d7b8dfe92594339a547b","src/psp.rs":"b88f5659011db6a189bd06de3a365c35a34cec6b7ab547719b8ae2b371f9cb21","src/sgx.rs":"964d6af358f5c85f948275090e5a7854e0169c43b5c338070b6a4cd156ebc9e6","src/solid/aarch64.rs":"4d4236500f98858fc249f3b6858af5009851c8c582031926b8195b2646f7da5e","src/solid/arm.rs":"4d4236500f98858fc249f3b6858af5009851c8c582031926b8195b2646f7da5e","src/solid/mod.rs":"a2045b6089af91bd533a666773d3b99fcfaf03da7a06869382969eed059b0e4c","src/switch.rs":"bfdcaf0268d79652ee52c1a2837959b8253e6a4124fd94dda82727ecc442a758","src/teeos/mod.rs":"2cca695904dacb13c063fb6463a6e0b2bb47ed86be0fdc9476938297441d7795","src/trusty.rs":"c5012aeefc4307c11374f062ad1d530e2ec556e7069e375de326a49c77f65e22","src/unix/aix/mod.rs":"fa3fa1f33e381f9492321e47f683300460d02fa230f14965ee808eeab2884408","src/unix/aix/powerpc64.rs":"c2315d638bad020e75ef15f85989f8feffb4f38bac4b7e70642031c6ae1fb65d","src/unix/bsd/apple/b32/mod.rs":"39a7f5cf92cf2d26ca50f54182fe57028cf24147ec12cb89d251301d65862138","src/unix/bsd/apple/b64/aarch64/mod.rs":"3ce904e72d78e6465ca52fd3905208fbb8cbc49a1695a708b12dff2ee01f4d36","src/unix/bsd/apple/b64/mod.rs":"a77ef659cd2edadb39db562e655ea5efdb102ed0dfb872d8d004b38d1a0e9e49","src/unix/bsd/apple/b64/x86_64/mod.rs":"71bad5c051368805146168c4063534b010afcb358477c1f164712bb015bf3fb6","src/unix/bsd/apple/mod.rs":"39216bfe363384709f0b38df6b333206ad85361e6b1389f699b2b88d46aa3e1f","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"07b19390b9ae8f541ac35fd4e14685d639b95152d6d7a33814bb749b8b927298","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"9681882d03a9cc7e00db0d9f0be797426ce4e9f7584d3fe4ab43bc7967dd0e4e","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"9e8e5a9f1de648b248f257aab6e1bc8ccfe9e481554a52bdef06aefd262a15a2","src/unix/bsd/freebsdlike/freebsd/arm.rs":"36158ac5a31d86a919d8e477a9ba64467d38b57bc3910e19b082130811c2f289","src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs":"8d9bef35f3e490d04755a59a99ad054ef20498beff979ae8b14acbec1097318a","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"45f718f556a8368f282944d9a14afae7261827ec4838d26719290466efc4f023","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"77bef57a5697d837331cff8947c50d070b28bb7aaa51b23f4d604cedaba76806","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"2dfe0dd90c956e3bcc8bbbd6926c5b370829f411f22b80fa749fe87ebf0ea47b","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"64c4bd82eaf30a2681417f982fce28de7d1b0743bfaa14004692a56cee44be21","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"f0d4d0fcd6c4e3bd77f84474a404be8a3a326731e9fe52008a09bcfb123a98a0","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"64c4bd82eaf30a2681417f982fce28de7d1b0743bfaa14004692a56cee44be21","src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs":"c6efc4de30803d89d7c73ef59e5e18dfb3c4a0c0688855b9193b228573651106","src/unix/bsd/freebsdlike/freebsd/freebsd14/x86_64.rs":"d6e66809e109dc779efe5584b79d34fcd6fdba91973a415d64ae66f481f45940","src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs":"48730e73367432bce709d5bcf316197c48f7501833a4798df5fc5f7043f04030","src/unix/bsd/freebsdlike/freebsd/freebsd15/x86_64.rs":"d6e66809e109dc779efe5584b79d34fcd6fdba91973a415d64ae66f481f45940","src/unix/bsd/freebsdlike/freebsd/mod.rs":"59ba589299a415936aad6f99f253a5b31e9b1e83ab6f0db3ceba077b7ba198b7","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"36a03b20551864c92852e967ebf91c6a8105fd520e41a35273e2dc6487590267","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"3de9344db84572975b5965ac4292cf475e3c96854c58b7a478b9972407ffd1fd","src/unix/bsd/freebsdlike/freebsd/riscv64.rs":"3dfdc394922c2cb66790309c76913576a7235513ad3bf9
Line truncated
|
||||||
|
\ No newline at end of file
|
||||||
|
+{"files":{"CHANGELOG.md":"747b437db48b8ded620a8738f9c1dbc2fde3d26db03d0782796537a9e505a263","CONTRIBUTING.md":"155e7f4e96fafe9ee5c8adb5068be27a22de89a95ca9bfc7baf517b9850d20d6","Cargo.lock":"8f6d0b13c977c8016b568c0a35b5ae709318e0766af3cff4a84d351219013841","Cargo.toml":"7f31f2e612b4c14b57ecdcec4912ac1514e26e3c061d5b06b54e1e34e83191b1","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"a198be444453fe0b24d4fb6a8b732eb9e6dc77ebcfd119fca95b97b45c77c77a","build.rs":"199eb63f03c4e90cad31c1f03a15bac3d81ca97f31bcb81c45bbd0d909e57d61","rustfmt.toml":"e9321ff995242e8cb0a4984254f0748ef11a89ca4618cab8f047ee59a88768e7","src/fuchsia/aarch64.rs":"9cd032304a54321a8926cf3157194c5d79a2491b1b974a05fe71729fa43b5738","src/fuchsia/mod.rs":"e27680db23fa506e379a86033b42813ea1f6c8f6b01d97a9a880d9d7be6d9f7f","src/fuchsia/riscv64.rs":"f2aba92cb88480bd72a9eb7a41aafc63c5db293b93113fa973fe5ab1fd819e29","src/fuchsia/x86_64.rs":"66c6ae7d3f81b1d7c962671aa074d709c39069e3b5830621a26d94c15caf588f","src/hermit.rs":"e414a3ecd5b5bc6c0bf7ce7c31639805943b789fbbf6006ceeb85ab44f3e4564","src/lib.rs":"d65975abfeac27f8dbef348fa7afa0b2b761a0a7073f4621c1bbff41334983cd","src/macros.rs":"076f328df1d51017bac70456e7b8290bee1b07390328fff48102e05048ada56a","src/primitives.rs":"0096ec3f32454a630fd1e78fa5aaaa033f107c1394a0d7b8dfe92594339a547b","src/psp.rs":"b88f5659011db6a189bd06de3a365c35a34cec6b7ab547719b8ae2b371f9cb21","src/sgx.rs":"964d6af358f5c85f948275090e5a7854e0169c43b5c338070b6a4cd156ebc9e6","src/solid/aarch64.rs":"4d4236500f98858fc249f3b6858af5009851c8c582031926b8195b2646f7da5e","src/solid/arm.rs":"4d4236500f98858fc249f3b6858af5009851c8c582031926b8195b2646f7da5e","src/solid/mod.rs":"a2045b6089af91bd533a666773d3b99fcfaf03da7a06869382969eed059b0e4c","src/switch.rs":"bfdcaf0268d79652ee52c1a2837959b8253e6a4124fd94dda82727ecc442a758","src/teeos/mod.rs":"2cca695904dacb13c063fb6463a6e0b2bb47ed86be0fdc9476938297441d7795","src/trusty.rs":"c5012aeefc4307c11374f062ad1d530e2ec556e7069e375de326a49c77f65e22","src/unix/aix/mod.rs":"fa3fa1f33e381f9492321e47f683300460d02fa230f14965ee808eeab2884408","src/unix/aix/powerpc64.rs":"c2315d638bad020e75ef15f85989f8feffb4f38bac4b7e70642031c6ae1fb65d","src/unix/bsd/apple/b32/mod.rs":"39a7f5cf92cf2d26ca50f54182fe57028cf24147ec12cb89d251301d65862138","src/unix/bsd/apple/b64/aarch64/mod.rs":"3ce904e72d78e6465ca52fd3905208fbb8cbc49a1695a708b12dff2ee01f4d36","src/unix/bsd/apple/b64/mod.rs":"a77ef659cd2edadb39db562e655ea5efdb102ed0dfb872d8d004b38d1a0e9e49","src/unix/bsd/apple/b64/x86_64/mod.rs":"71bad5c051368805146168c4063534b010afcb358477c1f164712bb015bf3fb6","src/unix/bsd/apple/mod.rs":"39216bfe363384709f0b38df6b333206ad85361e6b1389f699b2b88d46aa3e1f","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"07b19390b9ae8f541ac35fd4e14685d639b95152d6d7a33814bb749b8b927298","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"9681882d03a9cc7e00db0d9f0be797426ce4e9f7584d3fe4ab43bc7967dd0e4e","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"9e8e5a9f1de648b248f257aab6e1bc8ccfe9e481554a52bdef06aefd262a15a2","src/unix/bsd/freebsdlike/freebsd/arm.rs":"36158ac5a31d86a919d8e477a9ba64467d38b57bc3910e19b082130811c2f289","src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs":"8d9bef35f3e490d04755a59a99ad054ef20498beff979ae8b14acbec1097318a","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"45f718f556a8368f282944d9a14afae7261827ec4838d26719290466efc4f023","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"77bef57a5697d837331cff8947c50d070b28bb7aaa51b23f4d604cedaba76806","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"2dfe0dd90c956e3bcc8bbbd6926c5b370829f411f22b80fa749fe87ebf0ea47b","src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs":"64c4bd82eaf30a2681417f982fce28de7d1b0743bfaa14004692a56cee44be21","src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs":"f0d4d0fcd6c4e3bd77f84474a404be8a3a326731e9fe52008a09bcfb123a98a0","src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs":"64c4bd82eaf30a2681417f982fce28de7d1b0743bfaa14004692a56cee44be21","src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs":"c6efc4de30803d89d7c73ef59e5e18dfb3c4a0c0688855b9193b228573651106","src/unix/bsd/freebsdlike/freebsd/freebsd14/x86_64.rs":"d6e66809e109dc779efe5584b79d34fcd6fdba91973a415d64ae66f481f45940","src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs":"48730e73367432bce709d5bcf316197c48f7501833a4798df5fc5f7043f04030","src/unix/bsd/freebsdlike/freebsd/freebsd15/x86_64.rs":"d6e66809e109dc779efe5584b79d34fcd6fdba91973a415d64ae66f481f45940","src/unix/bsd/freebsdlike/freebsd/mod.rs":"59ba589299a415936aad6f99f253a5b31e9b1e83ab6f0db3ceba077b7ba198b7","src/unix/bsd/freebsdlike/freebsd/powerpc.rs":"36a03b20551864c92852e967ebf91c6a8105fd520e41a35273e2dc6487590267","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"3de9344db84572975b5965ac4292cf475e3c96854c58b7a478b9972407ffd1fd","src/unix/bsd/freebsdlike/freebsd/riscv64.rs":"3dfdc394922c2cb66790309c76913576a7235513ad3bf9
Line truncated
|
||||||
|
\ No newline at end of file
|
||||||
|
--- a/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||||
|
+++ b/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/arm/mod.rs
|
||||||
|
@@ -795,7 +795,3 @@
|
||||||
|
pub const SYS_futex_waitv: c_long = 449;
|
||||||
|
pub const SYS_set_mempolicy_home_node: c_long = 450;
|
||||||
|
pub const SYS_mseal: c_long = 462;
|
||||||
|
-
|
||||||
|
-extern "C" {
|
||||||
|
- pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
|
||||||
|
-}
|
||||||
|
--- a/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||||
|
+++ b/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/powerpc.rs
|
||||||
|
@@ -745,7 +745,3 @@
|
||||||
|
pub const SYS_futex_waitv: c_long = 449;
|
||||||
|
pub const SYS_set_mempolicy_home_node: c_long = 450;
|
||||||
|
pub const SYS_mseal: c_long = 462;
|
||||||
|
-
|
||||||
|
-extern "C" {
|
||||||
|
- pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
|
||||||
|
-}
|
||||||
|
--- a/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||||
|
+++ b/third_party/rust/libc/src/unix/linux_like/linux/musl/b32/x86/mod.rs
|
||||||
|
@@ -913,7 +913,3 @@
|
||||||
|
pub const EFL: c_int = 14;
|
||||||
|
pub const UESP: c_int = 15;
|
||||||
|
pub const SS: c_int = 16;
|
||||||
|
-
|
||||||
|
-extern "C" {
|
||||||
|
- pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
|
||||||
|
-}
|
||||||
|
--- a/third_party/rust/libc/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||||
|
+++ b/third_party/rust/libc/src/unix/linux_like/linux/musl/b64/mod.rs
|
||||||
|
@@ -81,10 +81,6 @@
|
||||||
|
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
|
||||||
|
pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 32;
|
||||||
|
|
||||||
|
-extern "C" {
|
||||||
|
- pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
cfg_if! {
|
||||||
|
if #[cfg(target_arch = "aarch64")] {
|
||||||
|
mod aarch64;
|
||||||
|
--- a/third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs
|
||||||
|
+++ b/third_party/rust/libc/src/unix/linux_like/linux/musl/mod.rs
|
||||||
|
@@ -971,6 +971,9 @@
|
||||||
|
pub fn dirname(path: *mut c_char) -> *mut c_char;
|
||||||
|
pub fn basename(path: *mut c_char) -> *mut c_char;
|
||||||
|
|
||||||
|
+ // Addded in `musl` 1.1.20
|
||||||
|
+ pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
|
||||||
|
+
|
||||||
|
// Added in `musl` 1.1.24
|
||||||
|
pub fn posix_spawn_file_actions_addchdir_np(
|
||||||
|
actions: *mut crate::posix_spawn_file_actions_t,
|
||||||
@@ -17,6 +17,7 @@ SRC_URI = " \
|
|||||||
file://0010-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
|
file://0010-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
|
||||||
file://0011-Fix-build-error-with-musl.patch \
|
file://0011-Fix-build-error-with-musl.patch \
|
||||||
file://0012-Replace-deprecated-ast.Str-and-ast.Index-with-ast.Co.patch \
|
file://0012-Replace-deprecated-ast.Str-and-ast.Index-with-ast.Co.patch \
|
||||||
|
file://0013-libc-Enable-getrandom-on-all-musl-platforms.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "358bb03c550f95172f1e31694e4287da3411560df91e931cb25210efdf90e524"
|
SRC_URI[sha256sum] = "358bb03c550f95172f1e31694e4287da3411560df91e931cb25210efdf90e524"
|
||||||
|
|||||||
Reference in new issue
Block a user