From 84b695a0a21123faf7cd07a51ebf31b676eebf58 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 14 Feb 2023 07:32:37 +0000 Subject: [PATCH 1/2] dev-lang: Upgrade dev-lang/rust 1.67.0 to 1.67.1 --- .../changelog/updates/2023-02-14-rust-1.67.1-update.md | 1 + .../src/third_party/coreos-overlay/dev-lang/rust/Manifest | 4 ++-- .../dev-lang/rust/{rust-1.67.0.ebuild => rust-1.67.1.ebuild} | 0 .../profiles/coreos/base/package.accept_keywords | 4 ++-- .../virtual/rust/{rust-1.67.0.ebuild => rust-1.67.1.ebuild} | 0 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-14-rust-1.67.1-update.md rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.67.0.ebuild => rust-1.67.1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/virtual/rust/{rust-1.67.0.ebuild => rust-1.67.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-14-rust-1.67.1-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-14-rust-1.67.1-update.md new file mode 100644 index 0000000000..3d1e1e5289 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-02-14-rust-1.67.1-update.md @@ -0,0 +1 @@ +- Rust ([1.67.1](https://github.com/rust-lang/rust/releases/tag/1.67.1)) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest index 634b1f8397..7a36f8cc3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest @@ -30,5 +30,5 @@ DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz 186651920 BLAKE2B de89dd720320d DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d313eafed62763b0905636ff22d6c736696c55e55d2442512a95e239b5b37199fdb125d312284b2a249782fa61d552284c8eb3ef8c9aa9ea36283a9fb975dd66 SHA512 c491f07c77baeac6b92c2425092c1b3694e72c49d4e6e511597aac03d51930cd414a95b0d691a9b23df266fba8df3dd90bf7d30624383bd213403fe0cbc83ffb DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz 270294752 BLAKE2B b068a9400f29e9318e8d52f2c37df72f1b8fd91ca0bba342e6681544595a7f2697bf10437be6c4612a36d2781cc915920b498273ab12dbe1163c41d9d4e9b438 SHA512 df03ef29b03924346ef2a4b5dbf1c7ce6e33fb1f357eb04b0fa80e48a607b29f5929ce587412c9dd3f385d6382f0229c19d0ce78d6c060ddc0539429d3cfc606 DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B a262a2a020a142ea8e3906a9c93d9294906ee51f5d22efd4ef041b6032524d2714e0b511f7deb366c0ee3337ecd52f1e091b6bfed01615eaa9026996100afe2d SHA512 f390b3a788c5b15b1acee01505b6501ad4a3170cd2f23ec490b02294ce0a62c3f708f1e66c0ba8258a1042dea0401a1e09d31d34e99558f50b0f65b359354182 -DIST rustc-1.67.0-src.tar.xz 142750964 BLAKE2B 5dcea694548f5162bed6020ca12ecfa178fba479fbe6f29ec310f9c5cfaae13999de7b861498e92561f21001fed295d21dd9230ccb5da2f20c638309e785cfda SHA512 6d1ddb54c0ee2c4f8ccf73f3c306c8d8868feb738d5e77eb5a5d25f716395c27d1b3666929c87f9dc84213a9acfdb56254feac92ef0fea3147e2c644391c12b4 -DIST rustc-1.67.0-src.tar.xz.asc 801 BLAKE2B b46159b7cbe081cb34d82b2642397788d09d09f9e55fd961a491862c2c1827b0752530fa74e1a8245cab9ff898d2f021bfdae4820edca34a87c9e18202d7a31e SHA512 cceb0aa5d43c476a051c77263fe152085b8d7d337f78117077a1e460bb9e31b75becd36a8f571fc1275a268ac1107d680012a82a7378851d2a9f16748d95a929 +DIST rustc-1.67.1-src.tar.xz 142758844 BLAKE2B 55b2a98592b1a2e465b7fb224607cbcb23cb13d5053b51abbd2e45428794f457b6925955c5c562f577830353e5287929b3588ee78a30036bf0ca13a3610316d9 SHA512 42d77ee93b168ae139b026138fb48d925624ff436a836aa97ee235f870e61ea11643b0cf7ad20bcafda774c6cd3855a4bc10a2e2ed1c4d82c6f15158963b304d +DIST rustc-1.67.1-src.tar.xz.asc 801 BLAKE2B eb507c6f53c592921eb31cccb17c9d6027c67fb1311726f2d25fe7d1f8a1aa051efb99d7207a5e4477df0b75898783437e653fa041ed7daa27e7a7c4263ec230 SHA512 6c962f680d74251b55f77a43d6e383be53bacff8428e0d003bda207de1fea7f716b88f16686d22a88d99518a4834bf299731855fb030477a995d5e1f3d0024f4 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 23a712da51..878d639229 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -17,8 +17,8 @@ =coreos-devel/fero-client-0.1.1 ** # Accept unstable host Rust compilers -=dev-lang/rust-1.67.0 ~amd64 ~arm64 -=virtual/rust-1.67.0 ~amd64 ~arm64 +=dev-lang/rust-1.67.1 ~amd64 ~arm64 +=virtual/rust-1.67.1 ~amd64 ~arm64 =dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.67.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.67.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.67.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.67.1.ebuild From 51ed887e3a0b92dc437bcc563d93c27294f0ab3a Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 14 Feb 2023 13:28:08 +0100 Subject: [PATCH 2/2] dev-lang/rust: adjust ebuilds for Rust 1.67.1 Adjust ebuilds to be able to build with Rust 1.67.1. Sync minor changes with upstream Gentoo as well. --- .../rust/files/1.67.0-bootstrap.patch | 38 ------------------- .../dev-lang/rust/files/1.67.0-doc-wasm.patch | 34 +++++++++++++++++ .../dev-lang/rust/rust-1.67.1.ebuild | 19 +++------- 3 files changed, 40 insertions(+), 51 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-bootstrap.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-doc-wasm.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-bootstrap.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-bootstrap.patch deleted file mode 100644 index eb160661a2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-bootstrap.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 675fa0b3dd5fe14b43ad5b7862f4528df7322468 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -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 Hash for Interned { - - impl Deref for Interned { - 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, U: ?Sized> AsRef for Interned { -- 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/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-doc-wasm.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-doc-wasm.patch new file mode 100644 index 0000000000..06011deb79 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild index edee75443d..dc35c602de 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.67.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \ multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig @@ -40,9 +40,9 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" +LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" -IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rls rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" # Please keep the LLVM dependency block separate. Since LLVM is slotted, # we need to *really* make sure we're not pulling more than one slot @@ -126,7 +126,6 @@ RDEPEND="${DEPEND} REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) miri? ( nightly ) parallel-compiler? ( nightly ) - rls? ( rust-src ) test? ( ${ALL_LLVM_TARGETS[*]} ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 ) @@ -166,7 +165,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 + "${FILESDIR}"/1.67.0-doc-wasm.patch ) S="${WORKDIR}/${MY_P}-src" @@ -207,7 +206,6 @@ pre_build_checks() { fi M=$(( $(usex clippy 128 0) + ${M} )) M=$(( $(usex miri 128 0) + ${M} )) - M=$(( $(usex rls 512 0) + ${M} )) M=$(( $(usex rustfmt 256 0) + ${M} )) # add 2G if we compile llvm and 256M per llvm_target if ! use system-llvm; then @@ -324,9 +322,8 @@ src_configure() { use clippy && tools+=',"clippy"' use miri && tools+=',"miri"' use profiler && tools+=',"rust-demangler"' - use rls && tools+=',"rls","analysis"' use rustfmt && tools+=',"rustfmt"' - use rust-analyzer && tools+=',"rust-analyzer"' + use rust-analyzer && tools+=',"rust-analyzer","analysis"' use rust-src && tools+=',"src"' local rust_stage0_root @@ -675,7 +672,6 @@ src_install() { use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) use profiler && symlinks+=( rust-demangler ) - use rls && symlinks+=( rls ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -736,9 +732,6 @@ src_install() { if use profiler; then echo /usr/bin/rust-demangler >> "${T}/provider-${P}" fi - if use rls; then - echo /usr/bin/rls >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"