Date: Friday, January 27, 2023 @ 17:03:13
Author: heftig
Revision: 467449
archrelease: copy trunk to testing-x86_64
Added:
rust/repos/testing-x86_64/0001-bootstrap-Change-libexec-dir.patch
(from rev 467447, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
rust/repos/testing-x86_64/0001-cargo-Change-libexec-dir.patch
(from rev 467447, rust/trunk/0001-cargo-Change-libexec-dir.patch)
rust/repos/testing-x86_64/0002-compiler-Change-LLVM-targets.patch
(from rev 467447, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
rust/repos/testing-x86_64/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
(from rev 467447,
rust/trunk/0003-compiler-Use-wasm-ld-for-wasm-targets.patch)
rust/repos/testing-x86_64/0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch
(from rev 467447,
rust/trunk/0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch)
rust/repos/testing-x86_64/PKGBUILD
(from rev 467447, rust/trunk/PKGBUILD)
rust/repos/testing-x86_64/keys/
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
rust/repos/testing-x86_64/keys/
---------------------------------------------------------------+
0001-bootstrap-Change-libexec-dir.patch | 90 -
0001-cargo-Change-libexec-dir.patch | 44
0002-compiler-Change-LLVM-targets.patch | 168 +--
0003-compiler-Use-wasm-ld-for-wasm-targets.patch | 48
0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch | 26
PKGBUILD | 508 +++++-----
6 files changed, 485 insertions(+), 399 deletions(-)
Deleted: 0001-bootstrap-Change-libexec-dir.patch
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch 2023-01-27 17:03:12 UTC (rev
467448)
+++ 0001-bootstrap-Change-libexec-dir.patch 2023-01-27 17:03:13 UTC (rev
467449)
@@ -1,45 +0,0 @@
-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 3cb0eccd324d..c4a76921fd06 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -403,7 +403,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);
-
-@@ -1046,7 +1046,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 e0be4c432f16..410e787616dd 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -783,7 +783,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-bootstrap-Change-libexec-dir.patch (from
rev 467447, rust/trunk/0001-bootstrap-Change-libexec-dir.patch)
===================================================================
--- 0001-bootstrap-Change-libexec-dir.patch (rev 0)
+++ 0001-bootstrap-Change-libexec-dir.patch 2023-01-27 17:03:13 UTC (rev
467449)
@@ -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 3cb0eccd324d..c4a76921fd06 100644
+--- a/src/bootstrap/dist.rs
++++ b/src/bootstrap/dist.rs
+@@ -403,7 +403,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);
+
+@@ -1046,7 +1046,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 e0be4c432f16..410e787616dd 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -783,7 +783,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"));
+
Deleted: 0001-cargo-Change-libexec-dir.patch
===================================================================
--- 0001-cargo-Change-libexec-dir.patch 2023-01-27 17:03:12 UTC (rev 467448)
+++ 0001-cargo-Change-libexec-dir.patch 2023-01-27 17:03:13 UTC (rev 467449)
@@ -1,22 +0,0 @@
-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 d67f874f132b..407da5a2538d 100644
---- a/src/cargo/util/auth.rs
-+++ b/src/cargo/util/auth.rs
-@@ -476,7 +476,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
467447, rust/trunk/0001-cargo-Change-libexec-dir.patch)
===================================================================
--- 0001-cargo-Change-libexec-dir.patch (rev 0)
+++ 0001-cargo-Change-libexec-dir.patch 2023-01-27 17:03:13 UTC (rev 467449)
@@ -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 d67f874f132b..407da5a2538d 100644
+--- a/src/cargo/util/auth.rs
++++ b/src/cargo/util/auth.rs
+@@ -476,7 +476,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 2023-01-27 17:03:12 UTC (rev
467448)
+++ 0002-compiler-Change-LLVM-targets.patch 2023-01-27 17:03:13 UTC (rev
467449)
@@ -1,84 +0,0 @@
-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 7a20100fd313..33fc4c54b65c 100644
---- a/compiler/rustc_session/src/config.rs
-+++ b/compiler/rustc_session/src/config.rs
-@@ -1853,7 +1853,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 d05b8aa42006..3cbf2f5d5bfc 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2944,6 +2944,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/0002-compiler-Change-LLVM-targets.patch (from
rev 467447, rust/trunk/0002-compiler-Change-LLVM-targets.patch)
===================================================================
--- 0002-compiler-Change-LLVM-targets.patch (rev 0)
+++ 0002-compiler-Change-LLVM-targets.patch 2023-01-27 17:03:13 UTC (rev
467449)
@@ -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 7a20100fd313..33fc4c54b65c 100644
+--- a/compiler/rustc_session/src/config.rs
++++ b/compiler/rustc_session/src/config.rs
+@@ -1853,7 +1853,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 d05b8aa42006..3cbf2f5d5bfc 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -2944,6 +2944,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(),
Deleted: 0003-compiler-Use-wasm-ld-for-wasm-targets.patch
===================================================================
--- 0003-compiler-Use-wasm-ld-for-wasm-targets.patch 2023-01-27 17:03:12 UTC
(rev 467448)
+++ 0003-compiler-Use-wasm-ld-for-wasm-targets.patch 2023-01-27 17:03:13 UTC
(rev 467449)
@@ -1,24 +0,0 @@
-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/0003-compiler-Use-wasm-ld-for-wasm-targets.patch
(from rev 467447, 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 2023-01-27 17:03:13 UTC
(rev 467449)
@@ -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/0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch
(from rev 467447,
rust/trunk/0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch)
===================================================================
--- 0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch
(rev 0)
+++ 0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch
2023-01-27 17:03:13 UTC (rev 467449)
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: bjorn3 <[email protected]>
+Date: Fri, 27 Jan 2023 11:48:36 +0000
+Subject: [PATCH] Revert back to LlvmArchiveBuilder on all platforms
+
+ArArchiveBuilder doesn't support reading thin archives, causing a
+regression.
+---
+ compiler/rustc_codegen_llvm/src/back/archive.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs
b/compiler/rustc_codegen_llvm/src/back/archive.rs
+index 0aee1a1439b9..2cf2f585f214 100644
+--- a/compiler/rustc_codegen_llvm/src/back/archive.rs
++++ b/compiler/rustc_codegen_llvm/src/back/archive.rs
+@@ -108,7 +108,9 @@ fn build(mut self: Box<Self>, output: &Path) -> bool {
+
+ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
+ fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn
ArchiveBuilder<'a> + 'a> {
+- if sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
++ // FIXME use ArArchiveBuilder on most targets again once reading thin
archives is
++ // implemented
++ if true || sess.target.arch == "wasm32" || sess.target.arch ==
"wasm64" {
+ Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() })
+ } else {
+ Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols))
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-27 17:03:12 UTC (rev 467448)
+++ PKGBUILD 2023-01-27 17:03:13 UTC (rev 467449)
@@ -1,224 +0,0 @@
-# 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.67.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=(!emptydirs !lto)
-depends=(gcc-libs llvm-libs curl libssh2 gcc)
-makedepends=(rust llvm 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}
- 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=('d029f14fce45a2ec7a9a605d2a0a40aae4739cb2fdae29ee9f7a6e9025a7fde4'
- 'SKIP'
- 'b2ef8c3bca5d72ed58ff8930e69947602f875a639c2b01de5943b1ecb1b5c3c3'
- '6a4e09671cd96a854cf0fc9a1f43651ac5a0fdc8dca571730131ae272b630cfe'
- 'e32fd355330e6c1ca4f0c630a3e254d261c48516128243a5d5d49f612cd217ed'
- 'f83bf98daee94d3e592fd2d96eecc25dc92b6b20575a3e3df7841a90a5b9f965')
-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=('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:
Copied: rust/repos/testing-x86_64/PKGBUILD (from rev 467447,
rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-27 17:03:13 UTC (rev 467449)
@@ -0,0 +1,284 @@
+# 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.67.0
+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=(
+ !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
+ 0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.patch
+)
+sha256sums=('d029f14fce45a2ec7a9a605d2a0a40aae4739cb2fdae29ee9f7a6e9025a7fde4'
+ 'SKIP'
+ 'b2ef8c3bca5d72ed58ff8930e69947602f875a639c2b01de5943b1ecb1b5c3c3'
+ '6a4e09671cd96a854cf0fc9a1f43651ac5a0fdc8dca571730131ae272b630cfe'
+ 'e32fd355330e6c1ca4f0c630a3e254d261c48516128243a5d5d49f612cd217ed'
+ 'f83bf98daee94d3e592fd2d96eecc25dc92b6b20575a3e3df7841a90a5b9f965'
+ '307c1ea2a7394ee166bc48fe3ba3d9e940dbd38d33d56824300407518df011cf')
+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
+
+ # Fix mesa build
+ # https://github.com/rust-lang/rust/issues/107334
+ # https://github.com/rust-lang/rust/pull/107360
+ patch -Np1 -i
../0004-Revert-back-to-LlvmArchiveBuilder-on-all-platforms.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:
