[arch-commits] Commit in rust/repos/extra-x86_64 (7 files)
Jan Steffens
heftig at archlinux.org
Thu May 6 22:38:27 UTC 2021
Date: Thursday, May 6, 2021 @ 22:38:26
Author: heftig
Revision: 414534
archrelease: copy trunk to extra-x86_64
Added:
rust/repos/extra-x86_64/0001-bootstrap-Change-libexec-dir.patch
(from rev 414533, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
rust/repos/extra-x86_64/0001-cargo-Change-libexec-dir.patch
(from rev 414533, rust/trunk/0001-cargo-Change-libexec-dir.patch)
rust/repos/extra-x86_64/0002-compiler-Change-LLVM-targets.patch
(from rev 414533, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
rust/repos/extra-x86_64/PKGBUILD
(from rev 414533, rust/trunk/PKGBUILD)
Deleted:
rust/repos/extra-x86_64/0001-Change-LLVM-targets.patch
rust/repos/extra-x86_64/PKGBUILD
rust/repos/extra-x86_64/libexec.diff
-----------------------------------------+
0001-Change-LLVM-targets.patch | 55 ----
0001-bootstrap-Change-libexec-dir.patch | 22 +
0001-cargo-Change-libexec-dir.patch | 22 +
0002-compiler-Change-LLVM-targets.patch | 84 +++++++
PKGBUILD | 356 +++++++++++++++---------------
libexec.diff | 24 --
6 files changed, 308 insertions(+), 255 deletions(-)
Deleted: 0001-Change-LLVM-targets.patch
===================================================================
--- 0001-Change-LLVM-targets.patch 2021-05-06 21:53:13 UTC (rev 414533)
+++ 0001-Change-LLVM-targets.patch 2021-05-06 22:38:26 UTC (rev 414534)
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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 | 3 +++
- compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +-
- 3 files changed, 5 insertions(+), 2 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 656136c4972..fea9aadfbd4 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 7a93bac72ca..cb844be88a3 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1995,6 +1995,9 @@ macro_rules! target_aliases {
- }
-
- target_aliases! {
-+ ("x86_64-pc-linux-gnu", "x86_64-unknown-linux-gnu"),
-+ ("i686-pc-linux-gnu", "i686-unknown-linux-gnu"),
-+
- // `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
- // (See <https://github.com/rust-lang/rust/issues/40531>.)
- ("x86_64-pc-solaris", "x86_64-sun-solaris"),
-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 2ba6d368484..7322745d9f6 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(),
Copied: rust/repos/extra-x86_64/0001-bootstrap-Change-libexec-dir.patch (from rev 414533, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch (rev 0)
+++ 0001-bootstrap-Change-libexec-dir.patch 2021-05-06 22:38:26 UTC (rev 414534)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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);
+ }
+ }
+
Copied: rust/repos/extra-x86_64/0001-cargo-Change-libexec-dir.patch (from rev 414533, rust/trunk/0001-cargo-Change-libexec-dir.patch)
===================================================================
--- 0001-cargo-Change-libexec-dir.patch (rev 0)
+++ 0001-cargo-Change-libexec-dir.patch 2021-05-06 22:38:26 UTC (rev 414534)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
Copied: rust/repos/extra-x86_64/0002-compiler-Change-LLVM-targets.patch (from rev 414533, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
===================================================================
--- 0002-compiler-Change-LLVM-targets.patch (rev 0)
+++ 0002-compiler-Change-LLVM-targets.patch 2021-05-06 22:38:26 UTC (rev 414534)
@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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(),
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-06 21:53:13 UTC (rev 414533)
+++ PKGBUILD 2021-05-06 22:38:26 UTC (rev 414534)
@@ -1,176 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: userwithuid <userwithuid at gmail.com>
-
-pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs')
-epoch=1
-pkgver=1.51.0
-pkgrel=1
-
-_llvm_ver=11.1.0
-
-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')
-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-Change-LLVM-targets.patch
- libexec.diff
-)
-sha256sums=('7a6b9bafc8b3d81bbc566e7c0d1f17c9f499fd22b95142f7ea3a8e4d1f9eb847'
- 'SKIP'
- 'def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274'
- 'SKIP'
- '3703c3defd3af5498a492f80fbb0b0b67c58a5ce0d1bab51328e65598141b745'
- '9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
- '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar at redhat.com>
- 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
-
-prepare() {
- cd "rustc-$pkgver-src"
-
- # Use our *-pc-linux-gnu targets, making LTO with clang simpler
- patch -Np1 -i ../0001-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
-
-[build]
-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
-tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
-cargo = "/usr/bin/cargo"
-rustc = "/usr/bin/rustc"
-python = "/usr/bin/python"
-extended = true
-sanitizers = false
-profiler = true
-vendor = 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]
-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"
-
- python ./x.py dist -j "$(nproc)"
- 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:
Copied: rust/repos/extra-x86_64/PKGBUILD (from rev 414533, rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-06 22:38:26 UTC (rev 414534)
@@ -0,0 +1,180 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: userwithuid <userwithuid at gmail.com>
+
+pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs')
+epoch=1
+pkgver=1.52.0
+pkgrel=1
+
+_llvm_ver=11.1.0
+
+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=('33bec45b11a24fae2178cdd76794c3dc3c23c24ade7dfaedc09a74c278379a63'
+ 'SKIP'
+ 'def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274'
+ 'SKIP'
+ '9ce4373ca98a3d340807da7e1d3215796926add15ca3344c2f3970de534a5d6a'
+ '2c80a6bbd33b5f7291a6f6b0931c298631944edc18d36e3b9986e8ca25ce9ae1'
+ 'bbdc88799adc7fd07d368129bac7d6614f5da1682325e4042ba743e8c5f1bb54')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+ '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar at redhat.com>
+ 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at 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
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
+tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python"
+extended = true
+sanitizers = true
+profiler = true
+vendor = 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]
+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"
+
+ python ./x.py dist -j "$(nproc)"
+ 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:
Deleted: libexec.diff
===================================================================
--- libexec.diff 2021-05-06 21:53:13 UTC (rev 414533)
+++ libexec.diff 2021-05-06 22:38:26 UTC (rev 414534)
@@ -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
More information about the arch-commits
mailing list