commit: e6558ff508143e9d7c76233f012a53c30d79cabe Author: Sungjoon Moon <sumoon <AT> seoulsaram <DOT> org> AuthorDate: Thu Oct 9 18:35:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 10 06:28:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6558ff5
sys-devel/rust-std: Enable stage 0 build for 1.90.0 Closes: https://bugs.gentoo.org/963986 Signed-off-by: Sungjoon Moon <sumoon <AT> seoulsaram.org> Part-of: https://github.com/gentoo/gentoo/pull/44113 Closes: https://github.com/gentoo/gentoo/pull/44113 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/1.90.0-enable-stage-0-build.patch | 36 ++++++++++++++++++++++ sys-devel/rust-std/rust-std-1.89.0.ebuild | 2 +- sys-devel/rust-std/rust-std-1.90.0.ebuild | 2 +- .../rust-std/rust-std-1.91.0_beta20250928.ebuild | 3 -- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/sys-devel/rust-std/files/1.90.0-enable-stage-0-build.patch b/sys-devel/rust-std/files/1.90.0-enable-stage-0-build.patch new file mode 100644 index 000000000000..aa2358d7fac7 --- /dev/null +++ b/sys-devel/rust-std/files/1.90.0-enable-stage-0-build.patch @@ -0,0 +1,36 @@ +From c768240ec0a44fd508514d065c106b99a709e59c Mon Sep 17 00:00:00 2001 +From: Sungjoon Moon <[email protected]> +Date: Thu, 9 Oct 2025 18:27:12 +0000 +Subject: [PATCH] Fix build stage 0 + +--- + src/bootstrap/src/core/config/config.rs | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index 6055876c475..81adb1b4213 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -1073,19 +1073,6 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> { + | Subcommand::Vendor { .. } => flags_stage.unwrap_or(0), + }; + +- // Now check that the selected stage makes sense, and if not, print a warning and end +- match (config.stage, &config.cmd) { +- (0, Subcommand::Build) => { +- eprintln!("WARNING: cannot build anything on stage 0. Use at least stage 1."); +- exit!(1); +- } +- (0, Subcommand::Check { .. }) => { +- eprintln!("WARNING: cannot check anything on stage 0. Use at least stage 1."); +- exit!(1); +- } +- _ => {} +- } +- + if config.compile_time_deps && !matches!(config.cmd, Subcommand::Check { .. }) { + eprintln!( + "WARNING: Can't use --compile-time-deps with any subcommand other than check." +-- +2.51.0 + diff --git a/sys-devel/rust-std/rust-std-1.89.0.ebuild b/sys-devel/rust-std/rust-std-1.89.0.ebuild index ac1ac73a0723..190804c20e13 100644 --- a/sys-devel/rust-std/rust-std-1.89.0.ebuild +++ b/sys-devel/rust-std/rust-std-1.89.0.ebuild @@ -63,7 +63,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" PATCHES=( - "${FILESDIR}"/1.89.0-enable-stage-0-build.patch # remove for >=1.91.0 + "${FILESDIR}"/1.89.0-enable-stage-0-build.patch # remove for >=1.90.0 ) # # The cross magic diff --git a/sys-devel/rust-std/rust-std-1.90.0.ebuild b/sys-devel/rust-std/rust-std-1.90.0.ebuild index ac1ac73a0723..fc5a3bdf6189 100644 --- a/sys-devel/rust-std/rust-std-1.90.0.ebuild +++ b/sys-devel/rust-std/rust-std-1.90.0.ebuild @@ -63,7 +63,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" PATCHES=( - "${FILESDIR}"/1.89.0-enable-stage-0-build.patch # remove for >=1.91.0 + "${FILESDIR}"/1.90.0-enable-stage-0-build.patch # remove for >=1.91.0 ) # # The cross magic diff --git a/sys-devel/rust-std/rust-std-1.91.0_beta20250928.ebuild b/sys-devel/rust-std/rust-std-1.91.0_beta20250928.ebuild index ac1ac73a0723..d3494b367846 100644 --- a/sys-devel/rust-std/rust-std-1.91.0_beta20250928.ebuild +++ b/sys-devel/rust-std/rust-std-1.91.0_beta20250928.ebuild @@ -62,9 +62,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/rust.asc QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" -PATCHES=( - "${FILESDIR}"/1.89.0-enable-stage-0-build.patch # remove for >=1.91.0 -) # # The cross magic #
