Date: Friday, July 9, 2021 @ 23:05:11 Author: heftig Revision: 419404
archrelease: copy trunk to testing-x86_64 Added: rust/repos/testing-x86_64/ rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch (from rev 419403, rust/trunk/0001-bootstrap-Change-libexec-dir.patch) rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch (from rev 419403, rust/trunk/0001-cargo-Change-libexec-dir.patch) rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch (from rev 419403, rust/trunk/0002-compiler-Change-LLVM-targets.patch) rust/repos/testing-x86_64/PKGBUILD (from rev 419403, rust/trunk/PKGBUILD) -----------------------------------------+ 0001-bootstrap-Change-libexec-dir.patch | 22 +++ 0001-cargo-Change-libexec-dir.patch | 22 +++ 0002-compiler-Change-LLVM-targets.patch | 84 +++++++++++++ PKGBUILD | 181 ++++++++++++++++++++++++++++++ 4 files changed, 309 insertions(+) Copied: rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch (from rev 419403, rust/trunk/0001-bootstrap-Change-libexec-dir.patch) =================================================================== --- testing-x86_64/0001-bootstrap-Change-libexec-dir.patch (rev 0) +++ testing-x86_64/0001-bootstrap-Change-libexec-dir.patch 2021-07-09 23:05:11 UTC (rev 419404) @@ -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 8224eac823b..d0e0f14b202 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); + } + } + Copied: rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch (from rev 419403, rust/trunk/0001-cargo-Change-libexec-dir.patch) =================================================================== --- testing-x86_64/0001-cargo-Change-libexec-dir.patch (rev 0) +++ testing-x86_64/0001-cargo-Change-libexec-dir.patch 2021-07-09 23:05:11 UTC (rev 419404) @@ -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 d10b1988e..b58e05857 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 Copied: rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch (from rev 419403, rust/trunk/0002-compiler-Change-LLVM-targets.patch) =================================================================== --- testing-x86_64/0002-compiler-Change-LLVM-targets.patch (rev 0) +++ testing-x86_64/0002-compiler-Change-LLVM-targets.patch 2021-07-09 23:05:11 UTC (rev 419404) @@ -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 ad2b36691b5..0c57c774f24 100644 +--- a/compiler/rustc_session/src/config.rs ++++ b/compiler/rustc_session/src/config.rs +@@ -1507,7 +1507,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 165505ee731..00a7f5c2f8c 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 2af46693449..a2c6cf49f9c 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -2137,6 +2137,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 085079e06e5..2dfa6a040b1 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 +@@ -11,7 +11,7 @@ pub fn target() -> Target { + SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD; + + 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(), Copied: rust/repos/testing-x86_64/PKGBUILD (from rev 419403, rust/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2021-07-09 23:05:11 UTC (rev 419404) @@ -0,0 +1,181 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Daniel Micay <danielmi...@gmail.com> +# Contributor: userwithuid <userwith...@gmail.com> + +pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs') +epoch=1 +pkgver=1.53.0 +pkgrel=2 + +_llvm_ver=12.0.1 + +pkgdesc='Systems programming language focused on safety, speed and concurrency' +url='https://www.rust-lang.org/' +arch=('x86_64') +license=('MIT' 'Apache') + +makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python' + 'curl' 'cmake' 'musl' 'ninja') +checkdepends=('procps-ng' 'gdb') + +options=('!emptydirs' '!strip') + +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-bootstrap-Change-libexec-dir.patch + 0001-cargo-Change-libexec-dir.patch + 0002-compiler-Change-LLVM-targets.patch +) +sha256sums=('5cf7ca39a10f6bf4e0b0bd15e3b9a61ce721f301e12d148262e5ba968ab825b9' + 'SKIP' + 'b4c8d5f2a802332987c1c0a95b5afb35b1a66a96fe44add4e4ed4792c4cba0a4' + 'SKIP' + '35c9cd0d2a220c020f949c231d296bf4a1641ad253485e2f64440a6dc7731082' + '1833c3b5f8262b598115d13f08e2dcba792536768a2371869870e26244971112' + '6786cb5d3831c69659747377f7482b7cd7941a9bddf84c55571f9aef940e1b83') +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> + +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 ../0002-compiler-Change-LLVM-targets.patch + + cat >config.toml <<END +changelog-seen = 2 +profile = "user" + +[llvm] +link-shared = true + +[build] +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +rustfmt = "/usr/bin/rustfmt" +vendor = true +tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rust-demangler"] +sanitizers = true +profiler = true + +[install] +prefix = "/usr" + +[rust] +# LLVM crashes when passing an object through ThinLTO twice. This is triggered +# when using rust code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 + +debuginfo-level-std = 2 +channel = "stable" +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" + +[target.x86_64-unknown-linux-musl] +sanitizers = false +musl-root = "/usr/lib/musl" +END +} + +build() { + cd "rustc-$pkgver-src" + + export RUST_BACKTRACE=1 + export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" + [[ -d $RUST_COMPILER_RT_ROOT ]] + + DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" + + # Remove analysis data for libs that weren't installed + # TODO: Find out where these come from + local file lib + while read -rd '' file; do + lib="${file%.json}.rlib" + lib="${lib/\/analysis\///lib/}" + if [[ ! -e $lib ]]; then + echo "missing '$lib'" + rm -v "$file" + fi + done < <(find "dest-rust/usr/lib/rustlib" -path '*/analysis/*.json' -print0) + + # move docs and cross targets out of the way for splitting + mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 + mv dest-rust/usr/lib/rustlib/x86_64-unknown-linux-musl dest-musl + mv dest-rust/usr/share/doc dest-doc +} + +package_rust() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt' 'cargo-tree') + + cd "rustc-$pkgver-src" + + cp -a dest-rust/* "$pkgdir" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + # delete unnecesary files, e.g. components and manifest files only used for the uninstall script + cd "$pkgdir"/usr/lib/rustlib + rm components install.log manifest-* rust-installer-version uninstall.sh + + # rustbuild always installs copies of the shared libraries to /usr/lib, + # overwrite them with symlinks to the per-architecture versions + ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so + + install -d "$pkgdir"/usr/share/bash-completion/ + mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions +} + +package_lib32-rust-libs() { + pkgdesc='32-bit target and libraries for Rust' + depends=('lib32-gcc-libs') + provides=('lib32-rust') + conflicts=('lib32-rust') + replaces=('lib32-rust') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ + cp -a dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu + ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so +} + +package_rust-musl() { + pkgdesc='Musl target for Rust' + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ + cp -a dest-musl "$pkgdir"/usr/lib/rustlib/x86_64-unknown-linux-musl +} + +package_rust-docs() { + pkgdesc='Documentation for the Rust programming language' + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/share/ + cp -a dest-doc "$pkgdir"/usr/share/doc +} + +# vim:set ts=2 sw=2 et: