[arch-commits] Commit in rust/repos/testing-x86_64 (10 files)

Jan Steffens heftig at gemini.archlinux.org
Sun Nov 7 17:12:40 UTC 2021


    Date: Sunday, November 7, 2021 @ 17:12:40
  Author: heftig
Revision: 427476

archrelease: copy trunk to testing-x86_64

Added:
  rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch
    (from rev 427475, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
  rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch
    (from rev 427475, rust/trunk/0001-cargo-Change-libexec-dir.patch)
  rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch
    (from rev 427475, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
  rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
    (from rev 427475, rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch)
  rust/repos/testing-x86_64/PKGBUILD
    (from rev 427475, rust/trunk/PKGBUILD)
Deleted:
  rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch
  rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch
  rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch
  rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
  rust/repos/testing-x86_64/PKGBUILD

--------------------------------------------------+
 0001-bootstrap-Change-libexec-dir.patch          |   44 +-
 0001-cargo-Change-libexec-dir.patch              |   44 +-
 0002-compiler-Change-LLVM-targets.patch          |  168 ++++----
 0003-compiler-Use-wasm-ld-for-wasm-targets.patch |   48 +-
 PKGBUILD                                         |  436 ++++++++++-----------
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: 0001-bootstrap-Change-libexec-dir.patch
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch	2021-11-07 17:12:23 UTC (rev 427475)
+++ 0001-bootstrap-Change-libexec-dir.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -1,22 +0,0 @@
-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 d4875cfe1b06..798c45506373 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -1004,7 +1004,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);
-             }
-         }
- 

Copied: rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch (from rev 427475, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch	                        (rev 0)
+++ 0001-bootstrap-Change-libexec-dir.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -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 d4875cfe1b06..798c45506373 100644
+--- a/src/bootstrap/dist.rs
++++ b/src/bootstrap/dist.rs
+@@ -1004,7 +1004,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);
+             }
+         }
+ 

Deleted: 0001-cargo-Change-libexec-dir.patch
===================================================================
--- 0001-cargo-Change-libexec-dir.patch	2021-11-07 17:12:23 UTC (rev 427475)
+++ 0001-cargo-Change-libexec-dir.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -1,22 +0,0 @@
-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 d10b1988e920..b58e05857233 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/0001-cargo-Change-libexec-dir.patch (from rev 427475, rust/trunk/0001-cargo-Change-libexec-dir.patch)
===================================================================
--- 0001-cargo-Change-libexec-dir.patch	                        (rev 0)
+++ 0001-cargo-Change-libexec-dir.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -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 d10b1988e920..b58e05857233 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

Deleted: 0002-compiler-Change-LLVM-targets.patch
===================================================================
--- 0002-compiler-Change-LLVM-targets.patch	2021-11-07 17:12:23 UTC (rev 427475)
+++ 0002-compiler-Change-LLVM-targets.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -1,84 +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] 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 fdedb7e6a4af..c12568e77d83 100644
---- a/compiler/rustc_session/src/config.rs
-+++ b/compiler/rustc_session/src/config.rs
-@@ -1512,7 +1512,7 @@ pub fn parse_target_triple(
-                 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 165505ee7313..00a7f5c2f8c1 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 273221360b8b..4bbfad8441f3 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2296,6 +2296,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 085079e06e57..2dfa6a040b10 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/0002-compiler-Change-LLVM-targets.patch (from rev 427475, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
===================================================================
--- 0002-compiler-Change-LLVM-targets.patch	                        (rev 0)
+++ 0002-compiler-Change-LLVM-targets.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -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 fdedb7e6a4af..c12568e77d83 100644
+--- a/compiler/rustc_session/src/config.rs
++++ b/compiler/rustc_session/src/config.rs
+@@ -1512,7 +1512,7 @@ pub fn parse_target_triple(
+                 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 165505ee7313..00a7f5c2f8c1 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 273221360b8b..4bbfad8441f3 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -2296,6 +2296,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 085079e06e57..2dfa6a040b10 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(),

Deleted: 0003-compiler-Use-wasm-ld-for-wasm-targets.patch
===================================================================
--- 0003-compiler-Use-wasm-ld-for-wasm-targets.patch	2021-11-07 17:12:23 UTC (rev 427475)
+++ 0003-compiler-Use-wasm-ld-for-wasm-targets.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-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 4c954a1e567c..f1d5fbf83748 100644
---- a/compiler/rustc_target/src/spec/wasm_base.rs
-+++ b/compiler/rustc_target/src/spec/wasm_base.rs
-@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
-         // arguments just yet
-         limit_rdylib_exports: false,
- 
--        // we use the LLD shipped with the Rust toolchain by default
--        linker: Some("rust-lld".to_owned()),
-+        linker: Some("wasm-ld".to_owned()),
-         lld_flavor: LldFlavor::Wasm,
-         linker_is_gnu: false,
- 

Copied: rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch (from rev 427475, rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch)
===================================================================
--- 0003-compiler-Use-wasm-ld-for-wasm-targets.patch	                        (rev 0)
+++ 0003-compiler-Use-wasm-ld-for-wasm-targets.patch	2021-11-07 17:12:40 UTC (rev 427476)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+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 4c954a1e567c..f1d5fbf83748 100644
+--- a/compiler/rustc_target/src/spec/wasm_base.rs
++++ b/compiler/rustc_target/src/spec/wasm_base.rs
+@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
+         // arguments just yet
+         limit_rdylib_exports: false,
+ 
+-        // we use the LLD shipped with the Rust toolchain by default
+-        linker: Some("rust-lld".to_owned()),
++        linker: Some("wasm-ld".to_owned()),
+         lld_flavor: LldFlavor::Wasm,
+         linker_is_gnu: false,
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-07 17:12:23 UTC (rev 427475)
+++ PKGBUILD	2021-11-07 17:12:40 UTC (rev 427476)
@@ -1,218 +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>
-
-pkgbase=rust
-pkgname=(rust lib32-rust-libs rust-musl rust-wasm rust-src)
-epoch=1
-pkgver=1.56.1
-pkgrel=2
-pkgdesc="Systems programming language focused on safety, speed and concurrency"
-url=https://www.rust-lang.org/
-arch=(x86_64)
-license=(MIT Apache)
-options=(!emptydirs !strip)
-_llvm_ver=13.0.0
-depends=(gcc-libs llvm-libs curl libssh2 gcc)
-makedepends=(rust "llvm=$_llvm_ver" libffi lib32-gcc-libs perl python cmake musl
-             ninja wasi-libc lld)
-checkdepends=(procps-ng gdb)
-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-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
-)
-sha256sums=('c3898dfaadaa193dc88ddbc5345946a163211b58621df1cfff70186b4fc79511'
-            'SKIP'
-            '4c3602d76c7868a96b30c36165c4b7643e2a20173fced7e071b4baeb2d74db3f'
-            'SKIP'
-            '0f8cfbe0387dd62909fe9cb9523223ae1c2319494e2caf5fa4d0592198631b3e'
-            'a2a8a7c6a5732f79cc92f81d3c8380589c4e2b9a996fb565bbefe42f66b62597'
-            '977da945985dce4484ace8794cbc91241b1f3c27311c1a8b201231db6e1d19e5'
-            'fcf3c4442ba6a9e59415652ce8514428b2e37b80c5fe7d07fb44259ad37abafb')
-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 -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
-
-[dist]
-compression-formats = ["gz"]
-
-[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"
-
-[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
-  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
-  [[ -d $RUST_COMPILER_RT_ROOT ]]
-
-  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=('lldb: rust-lldb script'
-              'gdb: rust-gdb script')
-  provides=(cargo rustfmt)
-  conflicts=(cargo rustfmt 'rust-docs<1.56.1-2')
-  replaces=(cargo rustfmt cargo-tree 'rust-docs<1.56.1-2')
-
-  cp -a dest-rust/* "$pkgdir"
-}
-
-package_lib32-rust-libs() {
-  pkgdesc="32-bit target and libraries for Rust"
-  depends=(rust lib32-gcc-libs)
-  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=(rust lld)
-
-  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:

Copied: rust/repos/testing-x86_64/PKGBUILD (from rev 427475, rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-07 17:12:40 UTC (rev 427476)
@@ -0,0 +1,218 @@
+# 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>
+
+pkgbase=rust
+pkgname=(rust lib32-rust-libs rust-musl rust-wasm rust-src)
+epoch=1
+pkgver=1.56.1
+pkgrel=3
+pkgdesc="Systems programming language focused on safety, speed and concurrency"
+url=https://www.rust-lang.org/
+arch=(x86_64)
+license=(MIT Apache)
+options=(!emptydirs !strip)
+_llvm_ver=13.0.0
+depends=(gcc-libs llvm-libs curl libssh2 gcc)
+makedepends=(rust "llvm=$_llvm_ver" libffi lib32-gcc-libs perl python cmake musl
+             ninja wasi-libc lld)
+checkdepends=(procps-ng gdb)
+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-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
+)
+sha256sums=('c3898dfaadaa193dc88ddbc5345946a163211b58621df1cfff70186b4fc79511'
+            'SKIP'
+            '4c3602d76c7868a96b30c36165c4b7643e2a20173fced7e071b4baeb2d74db3f'
+            'SKIP'
+            '0f8cfbe0387dd62909fe9cb9523223ae1c2319494e2caf5fa4d0592198631b3e'
+            'a2a8a7c6a5732f79cc92f81d3c8380589c4e2b9a996fb565bbefe42f66b62597'
+            '977da945985dce4484ace8794cbc91241b1f3c27311c1a8b201231db6e1d19e5'
+            'fcf3c4442ba6a9e59415652ce8514428b2e37b80c5fe7d07fb44259ad37abafb')
+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 -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
+
+[dist]
+compression-formats = ["gz"]
+
+[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"
+
+[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
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+  [[ -d $RUST_COMPILER_RT_ROOT ]]
+
+  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=('lldb: rust-lldb script'
+              'gdb: rust-gdb script')
+  provides=(cargo rustfmt)
+  conflicts=(cargo rustfmt 'rust-docs<1:1.56.1-3')
+  replaces=(cargo rustfmt cargo-tree 'rust-docs<1:1.56.1-3')
+
+  cp -a dest-rust/* "$pkgdir"
+}
+
+package_lib32-rust-libs() {
+  pkgdesc="32-bit target and libraries for Rust"
+  depends=(rust lib32-gcc-libs)
+  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=(rust lld)
+
+  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:



More information about the arch-commits mailing list