From 9f4198ceb32c3559e6d4035d53acf2a883cfe1e0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 5 Aug 2023 01:08:23 +0000 Subject: [PATCH] extra/rust to 1.71.1-1 --- .../0001-bootstrap-Change-libexec-dir.patch | 4 +-- ...bootstrap-Change-bash-completion-dir.patch | 22 ++++++++------- ...eak-building-Rust-1.71.1-with-1.71.0.patch | 27 +++++++++++++++++++ extra/rust/PKGBUILD | 15 +++++++---- 4 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 extra/rust/0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch diff --git a/extra/rust/0001-bootstrap-Change-libexec-dir.patch b/extra/rust/0001-bootstrap-Change-libexec-dir.patch index 332e051dd..1f4cbb71f 100644 --- a/extra/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/extra/rust/0001-bootstrap-Change-libexec-dir.patch @@ -9,7 +9,7 @@ Subject: [PATCH] bootstrap: Change libexec dir 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index b49845386da1..05e106637d74 100644 +index 9cead7adc8c3..fc353c39cca1 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -420,7 +420,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { @@ -21,7 +21,7 @@ index b49845386da1..05e106637d74 100644 } let libdir_relative = builder.libdir_relative(compiler); -@@ -1082,7 +1082,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -1078,7 +1078,7 @@ fn run(self, builder: &Builder<'_>) -> Option { for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") { let dirent = dirent.expect("read dir entry"); if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") { diff --git a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch index 5a4cac388..7191fb7e2 100644 --- a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch +++ b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch @@ -4,19 +4,23 @@ Date: Thu, 13 Jul 2023 21:16:53 +0200 Subject: [PATCH] bootstrap: Change bash-completion dir --- - src/bootstrap/dist.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/bootstrap/dist.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 05e106637d74..426b1277fb23 100644 +index fc353c39cca1..426b1277fb23 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -1073,7 +1073,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -1071,7 +1071,11 @@ fn run(self, builder: &Builder<'_>) -> Option { + + tarball.add_file(&cargo, "bin", 0o755); tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); - tarball.add_renamed_file( - etc.join("cargo.bashcomp.sh"), -- "src/etc/bash_completion.d", +- tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo"); ++ tarball.add_renamed_file( ++ etc.join("cargo.bashcomp.sh"), + "share/bash-completion/completions", - "cargo", - ); ++ "cargo", ++ ); tarball.add_dir(etc.join("man"), "share/man/man1"); + tarball.add_legal_and_readme_to("share/doc/cargo"); + diff --git a/extra/rust/0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch b/extra/rust/0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch new file mode 100644 index 000000000..f2b52346f --- /dev/null +++ b/extra/rust/0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Fri, 4 Aug 2023 02:05:02 +0200 +Subject: [PATCH] bootstrap: Unbreak building Rust 1.71.1 with 1.71.0 + +See: https://github.com/rust-lang/rust/issues/114444 +--- + src/bootstrap/config.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index e192cda9a9a7..5721d8cf5bf6 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -1803,9 +1803,9 @@ pub fn check_build_rustc_version(&self) { + let source_version = + Version::parse(&fs::read_to_string(self.src.join("src/version")).unwrap().trim()) + .unwrap(); +- if !(source_version == rustc_version +- || (source_version.major == rustc_version.major +- && source_version.minor == rustc_version.minor + 1)) ++ if !(source_version.major == rustc_version.major ++ && (source_version.minor == rustc_version.minor ++ || source_version.minor == rustc_version.minor + 1)) + { + let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); + eprintln!( diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index e25c589a2..0f66c7b6d 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -20,7 +20,7 @@ pkgname=( rust-src ) epoch=1 -pkgver=1.71.0 +pkgver=1.71.1 pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency" url=https://www.rust-lang.org/ @@ -64,14 +64,16 @@ source=( 0002-bootstrap-Change-bash-completion-dir.patch 0003-compiler-Change-LLVM-targets.patch 0004-compiler-Use-wasm-ld-for-wasm-targets.patch + 0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch ) -b2sums=('43d5ec21eae1c1074c01ae0791940f4976ab2ec8a2754190e6a24cff62d5d29e0469a41e0aff36f264c57b5392042a4f415173a317088148e06f64095920aa34' +b2sums=('66c155e7a96d4c21e50feebe412fec0b4f4e3f6566f249a018b439c1e1ad1d807f00bcd854fecc267120db0a6d24939e21c86f46b1b13570b6f589d10f5b83c7' 'SKIP' 'd6b399d094d2c546d6fc53245e640dfb70921e250035b729bedc353a342de9daed167012810a47f4a2da3e0b70e31f89eeb02915870856ef2285a50a9553f14d' - 'b6c4ad33d54522b2b2f39459877ae05595622e424177e7b6a5e2743058aff3c8bf315b7020eae5460888266700d54c1f59983671aff4da53643bec80cd36b599' - '29873e73c52d2c02cfca5b29abc7f2477e98d5cfc3ca1c5c565a04eb925f483ac22dd98a2433a06817742daaa5f3984cc1bd695d3f6b610a41c030be18dd8257' + '71b3a5a5c169ad426fa0e6b6bf6ec5afa126bbe9257a617a248bc83f278a61990efac0b35d4ff5e50f0fa43db2e26071e1240526ae045a990c2441d0ecc92e9b' + 'fdf2159315b96337da84b45fc49b55ea73d6d14710f3967710da4fcee6d049ef9e5bb18e438e604750f4a3af9c909e58eea143f4a3c497acb7d806f834fd3b44' '2ecae93bc6323ef8285b590d576f8b7de385dc121317bd108e1e0863e0ef57d6bd7529564342443b182f1979d2e432a105998da61db16be8e6ea24f79c9acfcd' - 'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117') + 'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117' + '13a0d671e86a385237b69d7fda728f04c910eef20fc5c46ba5c4bc6b3defea0d5b34c6744f137c6b4e86d01ad098ac2c4dd0d9a114eb20749f18ffc5d34477ed') validpgpkeys=( 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) ) @@ -93,6 +95,9 @@ prepare() { # Use our wasm-ld patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch + # https://github.com/rust-lang/rust/issues/114444 + patch -Np1 -i ../0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch + cat >config.toml <