Date: Thursday, May 6, 2021 @ 21:14:07 Author: heftig Revision: 414528
Fix patches Added: rust/trunk/0001-bootstrap-Change-libexec-dir.patch rust/trunk/0001-cargo-Change-libexec-dir.patch rust/trunk/0002-compiler-Change-LLVM-targets.patch Modified: rust/trunk/PKGBUILD Deleted: rust/trunk/0001-Change-LLVM-targets.patch rust/trunk/libexec.diff -----------------------------------------+ 0001-Change-LLVM-targets.patch | 57 -------------------- 0001-bootstrap-Change-libexec-dir.patch | 22 +++++++ 0001-cargo-Change-libexec-dir.patch | 22 +++++++ 0002-compiler-Change-LLVM-targets.patch | 84 ++++++++++++++++++++++++++++++ PKGBUILD | 20 ++++--- libexec.diff | 24 -------- 6 files changed, 140 insertions(+), 89 deletions(-) Deleted: 0001-Change-LLVM-targets.patch =================================================================== --- 0001-Change-LLVM-targets.patch 2021-05-06 18:10:34 UTC (rev 414527) +++ 0001-Change-LLVM-targets.patch 2021-05-06 21:14:07 UTC (rev 414528) @@ -1,57 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Fri, 12 Mar 2021 17:31:56 +0100 -Subject: [PATCH] Change LLVM targets - - - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu - - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu - -Add aliases to match. ---- - compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- - compiler/rustc_target/src/spec/mod.rs | 4 ++-- - compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -index 9daf1d37dd2..b38e1888047 100644 ---- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs -@@ -9,7 +9,7 @@ pub fn target() -> Target { - base.stack_probes = StackProbeType::Call; - - Target { -- llvm_target: "i686-unknown-linux-gnu".to_string(), -+ llvm_target: "i686-pc-linux-gnu".to_string(), - pointer_width: 32, - data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\ - f64:32:64-f80:32-n8:16:32-S128" -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index c9fffd213d7..5538f1bdb20 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -621,9 +621,9 @@ fn to_json(&self) -> Json { - } - - supported_targets! { -- ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), -+ ("x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu", x86_64_unknown_linux_gnu), - ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), -- ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), -+ ("i686-unknown-linux-gnu", "i686-pc-linux-gnu", i686_unknown_linux_gnu), - ("i586-unknown-linux-gnu", i586_unknown_linux_gnu), - ("mips-unknown-linux-gnu", mips_unknown_linux_gnu), - ("mips64-unknown-linux-gnuabi64", mips64_unknown_linux_gnuabi64), -diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -index 04499bc5bbe..63f983bff0b 100644 ---- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -@@ -9,7 +9,7 @@ pub fn target() -> Target { - base.stack_probes = StackProbeType::Call; - - Target { -- llvm_target: "x86_64-unknown-linux-gnu".to_string(), -+ llvm_target: "x86_64-pc-linux-gnu".to_string(), - pointer_width: 64, - data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" - .to_string(), Added: 0001-bootstrap-Change-libexec-dir.patch =================================================================== --- 0001-bootstrap-Change-libexec-dir.patch (rev 0) +++ 0001-bootstrap-Change-libexec-dir.patch 2021-05-06 21:14:07 UTC (rev 414528) @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Thu, 6 May 2021 20:14:58 +0200 +Subject: [PATCH] bootstrap: Change libexec dir + +--- + src/bootstrap/dist.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 78b1d905459..ede4d221ea2 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -988,7 +988,7 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball { + 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-") { +- tarball.add_file(&dirent.path(), "libexec", 0o755); ++ tarball.add_file(&dirent.path(), "lib", 0o755); + } + } + Added: 0001-cargo-Change-libexec-dir.patch =================================================================== --- 0001-cargo-Change-libexec-dir.patch (rev 0) +++ 0001-cargo-Change-libexec-dir.patch 2021-05-06 21:14:07 UTC (rev 414528) @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Thu, 6 May 2021 20:13:31 +0200 +Subject: [PATCH] cargo: Change libexec dir + +--- + src/cargo/ops/registry/auth.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cargo/ops/registry/auth.rs b/src/cargo/ops/registry/auth.rs +index 660daa40d..2edc581c7 100644 +--- a/src/cargo/ops/registry/auth.rs ++++ b/src/cargo/ops/registry/auth.rs +@@ -223,7 +223,7 @@ fn sysroot_credential( + .parent() + .and_then(|p| p.parent()) + .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; +- let exe = root.join("libexec").join(format!( ++ let exe = root.join("lib").join(format!( + "cargo-credential-{}{}", + cred_name, + std::env::consts::EXE_SUFFIX Added: 0002-compiler-Change-LLVM-targets.patch =================================================================== --- 0002-compiler-Change-LLVM-targets.patch (rev 0) +++ 0002-compiler-Change-LLVM-targets.patch 2021-05-06 21:14:07 UTC (rev 414528) @@ -0,0 +1,84 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Fri, 12 Mar 2021 17:31:56 +0100 +Subject: [PATCH] compiler: Change LLVM targets + + - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu + - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu + +Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc- +triples to the -unknown- triples. This avoids defining proper -pc- +targets, as things break when this is done: + + - The crate ecosystem expects the -unknown- targets. Making -pc- + rustc's host triple (and thus default target) would break various + crates. + - Firefox's build breaks when the host triple (from + `rustc --version --verbose`) is different from the target triple + (from `rustc --print target-list`) that best matches autoconf. +--- + compiler/rustc_session/src/config.rs | 2 +- + compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- + compiler/rustc_target/src/spec/mod.rs | 9 +++++++++ + .../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- + 4 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs +index 75078a12311..572264940de 100644 +--- a/compiler/rustc_session/src/config.rs ++++ b/compiler/rustc_session/src/config.rs +@@ -1536,7 +1536,7 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType + early_error(error_format, &format!("target file {:?} does not exist", path)) + }) + } +- Some(target) => TargetTriple::TargetTriple(target), ++ Some(target) => TargetTriple::from_alias(target), + _ => TargetTriple::from_triple(host_triple()), + } + } +diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +index 9daf1d37dd2..b38e1888047 100644 +--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +@@ -9,7 +9,7 @@ pub fn target() -> Target { + base.stack_probes = StackProbeType::Call; + + Target { +- llvm_target: "i686-unknown-linux-gnu".to_string(), ++ llvm_target: "i686-pc-linux-gnu".to_string(), + pointer_width: 32, + data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\ + f64:32:64-f80:32-n8:16:32-S128" +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index c9fffd213d7..7bed09dd880 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -1994,6 +1994,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> { + Ok(TargetTriple::TargetPath(canonicalized_path)) + } + ++ /// Creates a target triple from its alias ++ pub fn from_alias(triple: String) -> Self { ++ match triple.as_str() { ++ "x86_64-pc-linux-gnu" => TargetTriple::from_triple("x86_64-unknown-linux-gnu"), ++ "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"), ++ _ => TargetTriple::TargetTriple(triple), ++ } ++ } ++ + /// Returns a string triple for this target. + /// + /// If this target is a path, the file name (without extension) is returned. +diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +index 04499bc5bbe..63f983bff0b 100644 +--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +@@ -9,7 +9,7 @@ pub fn target() -> Target { + base.stack_probes = StackProbeType::Call; + + Target { +- llvm_target: "x86_64-unknown-linux-gnu".to_string(), ++ llvm_target: "x86_64-pc-linux-gnu".to_string(), + pointer_width: 64, + data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" + .to_string(), Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-06 18:10:34 UTC (rev 414527) +++ PKGBUILD 2021-05-06 21:14:07 UTC (rev 414528) @@ -25,15 +25,17 @@ source=( "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig} - 0001-Change-LLVM-targets.patch - libexec.diff + 0001-bootstrap-Change-libexec-dir.patch + 0001-cargo-Change-libexec-dir.patch + 0002-compiler-Change-LLVM-targets.patch ) sha256sums=('33bec45b11a24fae2178cdd76794c3dc3c23c24ade7dfaedc09a74c278379a63' 'SKIP' 'def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274' 'SKIP' - 'e182b27caacd70ad1c7b40c679a4152bead1c4b592148bb3009c2f10b30e0e88' - '9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514') + '9ce4373ca98a3d340807da7e1d3215796926add15ca3344c2f3970de534a5d6a' + '2c80a6bbd33b5f7291a6f6b0931c298631944edc18d36e3b9986e8ca25ce9ae1' + 'bbdc88799adc7fd07d368129bac7d6614f5da1682325e4042ba743e8c5f1bb54') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-...@rust-lang.org> '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstel...@redhat.com> 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> @@ -41,12 +43,14 @@ prepare() { cd "rustc-$pkgver-src" + # Patch bootstrap and cargo so credential helpers + # are in /usr/lib instead of /usr/libexec + patch -Np1 -i ../0001-bootstrap-Change-libexec-dir.patch + patch -d src/tools/cargo -Np1 < ../0001-cargo-Change-libexec-dir.patch + # Use our *-pc-linux-gnu targets, making LTO with clang simpler - patch -Np1 -i ../0001-Change-LLVM-targets.patch + patch -Np1 -i ../0002-compiler-Change-LLVM-targets.patch - # Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec - patch -Np1 -i ../libexec.diff - cat >config.toml <<END [llvm] link-shared = true Deleted: libexec.diff =================================================================== --- libexec.diff 2021-05-06 18:10:34 UTC (rev 414527) +++ libexec.diff 2021-05-06 21:14:07 UTC (rev 414528) @@ -1,24 +0,0 @@ -diff -u -r rustc-1.50.0-src/src/bootstrap/dist.rs rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs ---- rustc-1.50.0-src/src/bootstrap/dist.rs 2021-02-10 17:36:44.000000000 +0000 -+++ rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs 2021-02-11 18:23:36.312495419 +0000 -@@ -980,7 +980,7 @@ - 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-") { -- tarball.add_file(&dirent.path(), "libexec", 0o755); -+ tarball.add_file(&dirent.path(), "lib", 0o755); - } - } - -diff -u -r rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs ---- rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-10 17:37:00.000000000 +0000 -+++ rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-11 18:24:14.944321464 +0000 -@@ -223,7 +223,7 @@ - .parent() - .and_then(|p| p.parent()) - .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; -- let exe = root.join("libexec").join(format!( -+ let exe = root.join("lib").join(format!( - "cargo-credential-{}{}", - cred_name, - std::env::consts::EXE_SUFFIX