diff options
Diffstat (limited to 'dev-lang/rust')
| -rw-r--r-- | dev-lang/rust/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/rust/files/1.67.0-bootstrap.patch | 38 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.67.0.ebuild | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index d1807f0a05bb..51ecb29b2126 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,6 +1,7 @@ AUX 1.62.1-musl-dynamic-linking.patch 898 BLAKE2B 09321e356d5c945f72e75e668bfee2a78158131713b917d7a70834dfb0e9c732a1d259ac5406e12552ffa5741dd03c08a5a04e3c68d3e6f905318486b23f081e SHA512 3edefd746a2b1eacaef7b3fd51b14a36ec0a5a4f8893355c48d3afba862405451f4d6961b22b429db1b402572d841d91351ac4759ab8ef3891fd00641d827d48 AUX 1.64.0-vendor-rustix-sparc-has-no-SIGSTKFLT.patch 2744 BLAKE2B 4eb03df7c21087a5833f031b85c999f95e8055492c61184bbe137407b4cdddb76d25f95d6beb5a1c6f82f42800f914f0fde60192c807a9548ee27ba226b10f65 SHA512 d489d0841ad297f8835b7adb1e5777865080f3f83a991da55a266da38396993c7b50f8ec98285ed7b174c879053670acedf9116b586c493338daac8f67741fb6 AUX 1.65.0-ignore-broken-and-non-applicable-tests.patch 1504 BLAKE2B 6318227c4a11ef0b849a85f164fc446ba34ffc3e4314b3f18248aa6605f08aa9a1adfaa2d9b2154c9e29fcab203d3c322fcf67e770778cc788f37bfb86ef353d SHA512 54a05e43c7d01129d8590495d2d651d677ebec06b5302355fec87d3c9bfdaab96bae192d17fafe115039d74a0d56fffa653a03ff0a8528a88582d64f1bbe663d +AUX 1.67.0-bootstrap.patch 1422 BLAKE2B 8b4435aa0d15545bbeb390a721b0c6ce0fe326815f47d2703a2c9f4a53d8df233d63a4b5687dc9dd9cd07865aaa319edf3a6dff89a39d7ac5acf248230e10bd1 SHA512 7af33ffcd742a3a2bdea69b9da610089c5f90772b6ed2e94e1541df66958ed941827108eacea90d9fcf5ba1cc6c10a879955fa0f13cf2e4bd15f28042414586b DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz 245636524 BLAKE2B 90e405bc6e7f47aec091924bcd7a35017d591936b2697f2b0ddc5271e65fa431cc193a2b392489b6636896fa2d4f3d8f5096d197cfed36e812ea7f3986130c85 SHA512 c163b19a56148646ebbdb10b5b20459a206b4a1c45a2de9ce69f2e45dc5527cc69920f81007ee6fb75080782d534a2a39f7580d0c8cfdcf36ebed971b2513b63 DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3ed79e6a5168676c19b9092692576b72b7bee6cc6fc6fc9213d492ac9641974e0bfefd9eee2663852580ee05038becb3045ff4410fe96aa8e529afc4d3652abb SHA512 14e635fbd60512e8d36c50c2c07d510236cc73661a6294f0a01fe260a945581885c60783e72cbcc0d85b87a161e0940b34b496380bbab659c6e5d0dbb4050a4d DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz 226328036 BLAKE2B 43119c95866b3bd7e1b0832079f4fa23d79f5168e1aeb1d9a984897486cdaabbf035150e5633114c3d87afc8cf47e2d591e7c32961cc7cef99595fec303bc348 SHA512 8af3a7293b73d5f3129a17651cc8009290e5eade4802a872bb2a568444c60b4227a89d419c751fa394bf81a38f553a7418a0abd6ec3234737148d1561b91bace @@ -105,5 +106,5 @@ DIST rustc-1.67.0-src.tar.xz 142750964 BLAKE2B 5dcea694548f5162bed6020ca12ecfa17 DIST rustc-1.67.0-src.tar.xz.asc 801 BLAKE2B b46159b7cbe081cb34d82b2642397788d09d09f9e55fd961a491862c2c1827b0752530fa74e1a8245cab9ff898d2f021bfdae4820edca34a87c9e18202d7a31e SHA512 cceb0aa5d43c476a051c77263fe152085b8d7d337f78117077a1e460bb9e31b75becd36a8f571fc1275a268ac1107d680012a82a7378851d2a9f16748d95a929 EBUILD rust-1.65.0.ebuild 23818 BLAKE2B c5a288099dc15b8dd61ffe06b2933bce2edbd2490bed6659e990863804448dff60e95f13362d33529e690bbbeee32f830bac1f7afc8fa34e63e93e905a78a14e SHA512 7f3b80e402f44e6edb8d29fa271f0e9246dcd101f5301c787965b75b209d1f4e0df25484dfc3a686e8f7ab70626558479c24233bbd036c4f59b178cfd61d1407 EBUILD rust-1.66.1.ebuild 23695 BLAKE2B 123eb9b2e5a3dd9380b54ec9bf4d2fab5bde4de44c67ebbc5935e5596ae4fb2ac51d9895d812138cefca3795fcb96b2c4f8923080bc7c539a9b98b4094361a00 SHA512 0eaecc97a1507b0d25323ac4b79d6dfa10d6d58cf9457b0d31f9cb91810429478fc36e18bf123dd340db60e806e50415123c64223d2c490d4b3d442369919c63 -EBUILD rust-1.67.0.ebuild 23059 BLAKE2B 507f17361593e96c1307341728aa8c9df8d2ee4c792daccf9771d74277096542374373e37e11d589ab1696f96b14bdd6818093347c0455a3feea82f9f516fec2 SHA512 3c121af3c427d2e82caacc6b7c5167807abb4cb9eadb2eedfed61481c70647d55c017d6b32d7bd97267305240ee1a4ff3bf92e3dcf7db710d51c214aabc21c28 +EBUILD rust-1.67.0.ebuild 23120 BLAKE2B f955cb4aa4035aef11f610d81f137351af12805d2eee75fff907edc752329bcf66477c7227e00a31e3d7100db509b7289ea575923a408662a4edd86c2f41c6ac SHA512 bd5346879a4a5132dbbfabc2063c03d5ca08cd6763df06aa0bec499a107370e66648addd01080f04df9a665cdc47f4fd86f2ed5fa9263a29e4bc4b7775ef6898 MISC metadata.xml 1676 BLAKE2B 37d026b952e72914faf51b5258c6a3da77aa088974094af5533a029abe3975beaba4efd8894cd419577f00b871c45ca3efa80195d90a42c9d1be1fb4befbe5eb SHA512 9a5e30977be9d76e60cab5a0698d5cc544240a6b0c54350aa0bd6aeff0e864f14d97a90ae5e3024e9b7bed54f7b2c7f561f46ad97ff99928f454af44f420d17c diff --git a/dev-lang/rust/files/1.67.0-bootstrap.patch b/dev-lang/rust/files/1.67.0-bootstrap.patch new file mode 100644 index 000000000000..eb160661a2c2 --- /dev/null +++ b/dev-lang/rust/files/1.67.0-bootstrap.patch @@ -0,0 +1,38 @@ +From 675fa0b3dd5fe14b43ad5b7862f4528df7322468 Mon Sep 17 00:00:00 2001 +From: Michael Goulet <michael@errs.io> +Date: Mon, 12 Dec 2022 18:29:33 +0000 +Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= + =?UTF-8?q?ap=20cache=20code?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/bootstrap/cache.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs +index be5c9bb078808..05f25af68ea8f 100644 +--- a/src/bootstrap/cache.rs ++++ b/src/bootstrap/cache.rs +@@ -89,16 +89,16 @@ impl<T: Internable + Hash> Hash for Interned<T> { + + impl<T: Internable + Deref> Deref for Interned<T> { + type Target = T::Target; +- fn deref(&self) -> &'static Self::Target { ++ fn deref(&self) -> &Self::Target { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } ++ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } + } + } + + impl<T: Internable + AsRef<U>, U: ?Sized> AsRef<U> for Interned<T> { +- fn as_ref(&self) -> &'static U { ++ fn as_ref(&self) -> &U { + let l = T::intern_cache().lock().unwrap(); +- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } ++ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } + } + } + diff --git a/dev-lang/rust/rust-1.67.0.ebuild b/dev-lang/rust/rust-1.67.0.ebuild index 91631c7b433a..095c3d5689e0 100644 --- a/dev-lang/rust/rust-1.67.0.ebuild +++ b/dev-lang/rust/rust-1.67.0.ebuild @@ -163,6 +163,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc PATCHES=( "${FILESDIR}"/1.65.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.62.1-musl-dynamic-linking.patch + "${FILESDIR}"/1.67.0-bootstrap.patch ) S="${WORKDIR}/${MY_P}-src" @@ -286,7 +287,7 @@ src_prepare() { local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \ - --without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die + --without=rust-docs-json-preview,rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die fi default |