Date: Friday, March 10, 2023 @ 13:12:52
Author: heftig
Revision: 470526
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 470525, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch
(from rev 470525, rust/trunk/0001-cargo-Change-libexec-dir.patch)
rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch
(from rev 470525, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
(from rev 470525,
rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch)
rust/repos/testing-x86_64/PKGBUILD
(from rev 470525, rust/trunk/PKGBUILD)
rust/repos/testing-x86_64/keys/
--------------------------------------------------+
0001-bootstrap-Change-libexec-dir.patch | 45 +++
0001-cargo-Change-libexec-dir.patch | 22 +
0002-compiler-Change-LLVM-targets.patch | 84 ++++++
0003-compiler-Use-wasm-ld-for-wasm-targets.patch | 24 +
PKGBUILD | 277 +++++++++++++++++++++
5 files changed, 452 insertions(+)
Copied: rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch (from
rev 470525, 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 2023-03-10
13:12:52 UTC (rev 470526)
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Thu, 6 May 2021 20:14:58 +0200
+Subject: [PATCH] bootstrap: Change libexec dir
+
+---
+ src/bootstrap/dist.rs | 4 ++--
+ src/bootstrap/tool.rs | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
+index 6594b23c56b0..2e6a96ba4d79 100644
+--- a/src/bootstrap/dist.rs
++++ b/src/bootstrap/dist.rs
+@@ -404,7 +404,7 @@ fn prepare_image(builder: &Builder<'_>, compiler:
Compiler, image: &Path) {
+ target: compiler.host,
+ })
+ .expect("rust-analyzer-proc-macro-server always builds");
+- builder.install(&ra_proc_macro_srv, &image.join("libexec"),
0o755);
++ builder.install(&ra_proc_macro_srv, &image.join("lib"), 0o755);
+
+ let libdir_relative = builder.libdir_relative(compiler);
+
+@@ -1047,7 +1047,7 @@ fn run(self, builder: &Builder<'_>) ->
Option<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);
+ }
+ }
+
+diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
+index 9a2100c2fb78..d51b1ff8449e 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -792,7 +792,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
+
+ // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
+ // so that r-a can use it.
+- let libexec_path = builder.sysroot(self.compiler).join("libexec");
++ let libexec_path = builder.sysroot(self.compiler).join("lib");
+ t!(fs::create_dir_all(&libexec_path));
+ builder.copy(&path,
&libexec_path.join("rust-analyzer-proc-macro-srv"));
+
Copied: rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch (from rev
470525, 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 2023-03-10 13:12:52 UTC
(rev 470526)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Thu, 6 May 2021 20:13:31 +0200
+Subject: [PATCH] cargo: Change libexec dir
+
+---
+ src/cargo/util/auth.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cargo/util/auth.rs b/src/cargo/util/auth.rs
+index 467abc2635a0..30232251b3a2 100644
+--- a/src/cargo/util/auth.rs
++++ b/src/cargo/util/auth.rs
+@@ -817,7 +817,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 470525, 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 2023-03-10
13:12:52 UTC (rev 470526)
@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 586454f76574..b831e9c4e18f 100644
+--- a/compiler/rustc_session/src/config.rs
++++ b/compiler/rustc_session/src/config.rs
+@@ -1887,7 +1887,7 @@ pub fn parse_target_triple(
+ early_error(error_format, &format!("target file {path:?} does
not exist"))
+ })
+ }
+- 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 73e536a7e4d9..af48d437533c 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::X86;
+
+ Target {
+- llvm_target: "i686-unknown-linux-gnu".into(),
++ llvm_target: "i686-pc-linux-gnu".into(),
+ 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 a094c2c54526..610241905ea8 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -2952,6 +2952,15 @@ pub fn from_path(path: &Path) -> Result<Self,
io::Error> {
+ Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path,
triple, contents })
+ }
+
++ /// 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 a91ab365b668..d605eb9ccf81 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
+@@ -14,7 +14,7 @@ pub fn target() -> Target {
+ | SanitizerSet::THREAD;
+
+ Target {
+- llvm_target: "x86_64-unknown-linux-gnu".into(),
++ llvm_target: "x86_64-pc-linux-gnu".into(),
+ 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"
+ .into(),
Copied:
rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
(from rev 470525, rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch)
===================================================================
--- testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
(rev 0)
+++ testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
2023-03-10 13:12:52 UTC (rev 470526)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Sat, 6 Nov 2021 22:42:06 +0100
+Subject: [PATCH] compiler: Use wasm-ld for wasm targets
+
+We don't ship rust-lld.
+---
+ compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/wasm_base.rs
b/compiler/rustc_target/src/spec/wasm_base.rs
+index 625d3b37c4f2..413c98d5c237 100644
+--- a/compiler/rustc_target/src/spec/wasm_base.rs
++++ b/compiler/rustc_target/src/spec/wasm_base.rs
+@@ -88,8 +88,7 @@ macro_rules! args {
+ // arguments just yet
+ limit_rdylib_exports: false,
+
+- // we use the LLD shipped with the Rust toolchain by default
+- linker: Some("rust-lld".into()),
++ linker: Some("wasm-ld".into()),
+ linker_flavor: LinkerFlavor::WasmLld(Cc::No),
+
+ pre_link_args,
Copied: rust/repos/testing-x86_64/PKGBUILD (from rev 470525,
rust/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2023-03-10 13:12:52 UTC (rev 470526)
@@ -0,0 +1,277 @@
+# Maintainer: Johannes Löthberg <[email protected]>
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Alexander F Rødseth <[email protected]>
+# Contributor: Daniel Micay <[email protected]>
+# Contributor: userwithuid <[email protected]>
+
+pkgbase=rust
+pkgname=(rust lib32-rust-libs rust-musl rust-wasm rust-src)
+epoch=1
+pkgver=1.68.0
+pkgrel=1
+pkgdesc="Systems programming language focused on safety, speed and concurrency"
+url=https://www.rust-lang.org/
+arch=(x86_64)
+license=(MIT Apache)
+options=(
+ !debug
+ !emptydirs
+ !lto
+ !strip
+)
+depends=(
+ curl
+ gcc
+ gcc-libs
+ libssh2
+ llvm-libs
+)
+makedepends=(
+ cmake
+ lib32-gcc-libs
+ libffi
+ lld
+ llvm
+ musl
+ ninja
+ perl
+ python
+ rust
+ wasi-libc
+)
+checkdepends=(
+ gdb
+ procps-ng
+)
+source=(
+ "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+ 0001-cargo-Change-libexec-dir.patch
+ 0001-bootstrap-Change-libexec-dir.patch
+ 0002-compiler-Change-LLVM-targets.patch
+ 0003-compiler-Use-wasm-ld-for-wasm-targets.patch
+)
+b2sums=('cff56d29a5325cfcc5a50d492f73c15d92434bfdfd5cabfa84be61f815e546d4ac8786c00c1db668e6c8216e1c00d898ef448f6cfd7ea2ffdeaf1a51de68b124'
+ 'SKIP'
+
'dce1c2340b172753b9d56dcc9d401e4cd9c66d64721c97e256974c18f17b0489e65e3732ef4e15538ea6e07c34f1269775a51c0c7c72e63a62f41ff258ce9ec2'
+
'01dee52ef899c0545cde37b5e1ba3ecfd5def3785145ed9f440df12945885311b63ff974294c1efed65b25b01bdb5cea37d7830e8d9775daefec8c1bcd3e159b'
+
'66c5cf262c4b865cdcc238d88aad4aa46e0861de0b4e20b5e86f7f1c312f7a40df0f9477fbc494949a99f51e9eb93537c072270e9bd20dfa79eb5cbe0d850e0f'
+
'9f3f911088a22101f8966dc16a1ecc65da5facaad5c169d9464e721aa452dd45968d359a5b35ae74ff23bd98d44c60cb04c0b8bc89e10fb99549c1670371c902')
+validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag
and Release Signing Key) <[email protected]>
+ 474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard
<[email protected]>
+
+prepare() {
+ cd rustc-$pkgver-src
+
+ # Patch bootstrap and cargo so credential helpers
+ # are in /usr/lib instead of /usr/libexec
+ patch -d src/tools/cargo -Np1 < ../0001-cargo-Change-libexec-dir.patch
+ patch -Np1 -i ../0001-bootstrap-Change-libexec-dir.patch
+
+ # Use our *-pc-linux-gnu targets, making LTO with clang simpler
+ patch -Np1 -i ../0002-compiler-Change-LLVM-targets.patch
+
+ # Use our wasm-ld
+ patch -Np1 -i ../0003-compiler-Use-wasm-ld-for-wasm-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",
+ "wasm32-unknown-unknown",
+ "wasm32-wasi",
+]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+rustfmt = "/usr/bin/rustfmt"
+locked-deps = true
+vendor = true
+tools = [
+ "cargo",
+ "rls",
+ "clippy",
+ "rustfmt",
+ "analysis",
+ "src",
+ "rust-demangler",
+]
+sanitizers = true
+profiler = true
+
+# Generating docs fails with the wasm32-* targets
+docs = false
+
+[install]
+prefix = "/usr"
+
+[rust]
+debuginfo-level-std = 2
+channel = "stable"
+description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel"
+rpath = false
+backtrace-on-ice = true
+remap-debuginfo = true
+jemalloc = true
+
+# 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
+
+# musl target produces warnings
+deny-warnings = false
+
+[dist]
+compression-formats = ["gz"]
+
+[target.x86_64-unknown-linux-gnu]
+cc = "/usr/bin/gcc"
+cxx = "/usr/bin/g++"
+ar = "/usr/bin/gcc-ar"
+ranlib = "/usr/bin/gcc-ranlib"
+llvm-config = "/usr/bin/llvm-config"
+
+[target.i686-unknown-linux-gnu]
+cc = "/usr/bin/gcc"
+cxx = "/usr/bin/g++"
+ar = "/usr/bin/gcc-ar"
+ranlib = "/usr/bin/gcc-ranlib"
+
+[target.x86_64-unknown-linux-musl]
+sanitizers = false
+musl-root = "/usr/lib/musl"
+
+[target.wasm32-unknown-unknown]
+sanitizers = false
+profiler = false
+
+[target.wasm32-wasi]
+sanitizers = false
+profiler = false
+wasi-root = "/usr/share/wasi-sysroot"
+END
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/$f"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+build() {
+ cd rustc-$pkgver-src
+
+ export RUST_BACKTRACE=1
+
+ DESTDIR="$srcdir/dest-rust" python ./x.py install -j "$(nproc)"
+
+ cd ../dest-rust
+
+ # delete unnecessary files, e.g. files only used for the uninstall script
+ rm
usr/lib/rustlib/{components,install.log,rust-installer-version,uninstall.sh}
+ rm usr/lib/rustlib/manifest-*
+
+ # rustbuild always installs copies of the shared libraries to /usr/lib,
+ # overwrite them with symlinks to the per-architecture versions
+ mkdir -p usr/lib32
+ ln -srft usr/lib usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so
+ ln -srft usr/lib32 usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+
+ mkdir -p usr/share/bash-completion
+ mv etc/bash_completion.d usr/share/bash-completion/completions
+
+ mkdir -p usr/share/licenses/rust
+ mv -t usr/share/licenses/rust usr/share/doc/rust/{COPYRIGHT,LICENSE*}
+
+ _pick dest-i686 usr/lib/rustlib/i686-unknown-linux-gnu usr/lib32
+ _pick dest-musl usr/lib/rustlib/x86_64-unknown-linux-musl
+ _pick dest-wasm usr/lib/rustlib/wasm32-*
+ _pick dest-src usr/lib/rustlib/src
+}
+
+package_rust() {
+ optdepends=(
+ 'gdb: rust-gdb script'
+ 'lldb: rust-lldb script'
+ )
+ provides=(
+ cargo
+ rustfmt
+ )
+ conflicts=(
+ cargo
+ 'rust-docs<1:1.56.1-3'
+ rustfmt
+ )
+ replaces=(
+ cargo
+ cargo-tree
+ 'rust-docs<1:1.56.1-3'
+ rustfmt
+ )
+
+ cp -a dest-rust/* "$pkgdir"
+}
+
+package_lib32-rust-libs() {
+ pkgdesc="32-bit target and libraries for Rust"
+ depends=(
+ lib32-gcc-libs
+ rust
+ )
+ provides=(lib32-rust)
+ conflicts=(lib32-rust)
+ replaces=(lib32-rust)
+
+ cp -a dest-i686/* "$pkgdir"
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s rust "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_rust-musl() {
+ pkgdesc="Musl target for Rust"
+ depends=(rust)
+
+ cp -a dest-musl/* "$pkgdir"
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s rust "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_rust-wasm() {
+ pkgdesc="WebAssembly targets for Rust"
+ depends=(
+ lld
+ rust
+ )
+
+ cp -a dest-wasm/* "$pkgdir"
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s rust "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_rust-src() {
+ pkgdesc="Source code for the Rust standard library"
+ depends=(rust)
+
+ cp -a dest-src/* "$pkgdir"
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s rust "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set ts=2 sw=2 et:
