From 070767cbd7bbc02adac473d0d1e0eb4a8b235fbd Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 6 Sep 2024 23:41:26 +0000 Subject: [PATCH] extra/rust to 1.81.0-1 --- extra/rust/.SRCINFO | 14 +++++++------- .../rust/0001-bootstrap-Change-libexec-dir.patch | 6 +++--- ...02-bootstrap-Change-bash-completion-dir.patch | 4 ++-- .../rust/0003-compiler-Change-LLVM-targets.patch | 16 ++++++++-------- extra/rust/PKGBUILD | 15 ++++++++------- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/extra/rust/.SRCINFO b/extra/rust/.SRCINFO index 62bbe1b40..52b135a8e 100644 --- a/extra/rust/.SRCINFO +++ b/extra/rust/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = rust pkgdesc = Systems programming language focused on safety, speed and concurrency - pkgver = 1.80.1 + pkgver = 1.81.0 pkgrel = 1 epoch = 1 url = https://www.rust-lang.org/ @@ -33,18 +33,18 @@ pkgbase = rust depends = zlib options = !emptydirs options = !lto - source = https://static.rust-lang.org/dist/rustc-1.80.1-src.tar.gz - source = https://static.rust-lang.org/dist/rustc-1.80.1-src.tar.gz.asc + source = https://static.rust-lang.org/dist/rustc-1.81.0-src.tar.gz + source = https://static.rust-lang.org/dist/rustc-1.81.0-src.tar.gz.asc source = 0001-bootstrap-Change-libexec-dir.patch source = 0002-bootstrap-Change-bash-completion-dir.patch source = 0003-compiler-Change-LLVM-targets.patch source = 0004-compiler-Use-wasm-ld-for-wasm-targets.patch validpgpkeys = 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE - b2sums = 28dd638a0b10a4c7cc098069ee4026b41f8fcb7abe4bfd4386620b73c236952455efc007d67990845b8d4ccb7541e2011cbfe04ab4eca49427eb0baf6bcc9e1a + b2sums = 0bc0ae9207306458c6721ddaff0bf56280a4ca4918502b44cfdfc200e73c4a5af88c95f9df53c1fe927f94ffe09d855e21dd6a749331041d719704dc209940ba b2sums = SKIP - b2sums = ba3444d558b9428231fd33156fc231b34dc445813c2c849106f0db0a519c26eb8b8f7f2b8b13e9a303949c50611d95b0ffaf4d0bdc7fde640337d04602b03312 - b2sums = b582b6bf142ad574e489d3aec1d8b317b014921fc7d8e28a496576ec08535a595a10491198dd04144bf266cb09cbd6427e313d734f65b04658ca7755051a0997 - b2sums = 32be97e6fefb20f3d1f16834d3522e22a79e3928e99817418e1f4599d2b5432a9f2d3c09e962c180bb0146d8725949bae24a0dffa7e5bd948a72ffb92d7ca22f + b2sums = 074a5ba5b3fcdfa1cab266f8c566129c1851ccbc4a59c0509ae74a58b261e6b8e095034f2c8fdf7615066430c7711ed6ac99da6ef3cdc9c156e8f105fd35f95e + b2sums = fe4d9352978fc952270bdd70e6607cd9c9fe4047cdd684acfa4ef5b19356e01c007f032b9c5aa75e5ab44be96a394fc44a9cfbb890bb95bca778b1297c1b2ba5 + b2sums = 9517c41760a5003927793db053892c1abe7b31c9f1b0a36c714c70c987d4badf9a957eac52d5bcd6bd758dc978580c134de74fd6eeb1677a604f184093ee8cc2 b2sums = 963aa64d27763f063b9fac483a870563f5a71a49ec02d17b7ca0c14dbf67064ba56028bbc45f2ee50b16eada725cb55c2aa2ab17ceadff65ba9e40cb220f7a0c pkgname = rust diff --git a/extra/rust/0001-bootstrap-Change-libexec-dir.patch b/extra/rust/0001-bootstrap-Change-libexec-dir.patch index cd7c270a2..3a3aa3850 100644 --- a/extra/rust/0001-bootstrap-Change-libexec-dir.patch +++ b/extra/rust/0001-bootstrap-Change-libexec-dir.patch @@ -9,7 +9,7 @@ Subject: [PATCH] bootstrap: Change libexec dir 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs -index 91039d0c8dcc..b01827f85ca1 100644 +index 1e9d2025bc78..1178e8c8ca89 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -426,7 +426,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { @@ -22,10 +22,10 @@ index 91039d0c8dcc..b01827f85ca1 100644 let libdir_relative = builder.libdir_relative(compiler); diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs -index 9df4698f21f3..ad0514be5f1d 100644 +index 087df2f8a88e..792ced48cfee 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs -@@ -724,7 +724,7 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -846,7 +846,7 @@ fn run(self, builder: &Builder<'_>) -> Option { // Copy `rust-analyzer-proc-macro-srv` to `/libexec/` // so that r-a can use it. diff --git a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch index d6a240455..881706e72 100644 --- a/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch +++ b/extra/rust/0002-bootstrap-Change-bash-completion-dir.patch @@ -8,10 +8,10 @@ Subject: [PATCH] bootstrap: Change bash-completion dir 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs -index b01827f85ca1..f0003352c570 100644 +index 1178e8c8ca89..acc2846750f1 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs -@@ -1111,7 +1111,11 @@ fn run(self, builder: &Builder<'_>) -> Option { +@@ -1126,7 +1126,11 @@ fn run(self, builder: &Builder<'_>) -> Option { tarball.add_file(cargo, "bin", 0o755); tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); diff --git a/extra/rust/0003-compiler-Change-LLVM-targets.patch b/extra/rust/0003-compiler-Change-LLVM-targets.patch index fe8cba0ef..806bdc474 100644 --- a/extra/rust/0003-compiler-Change-LLVM-targets.patch +++ b/extra/rust/0003-compiler-Change-LLVM-targets.patch @@ -23,10 +23,10 @@ targets, as things break when this is done: 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs -index a622f1b577df..849e9ceee01c 100644 +index e748d1ff47b6..e653865a553f 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs -@@ -1974,6 +1974,10 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches +@@ -1997,6 +1997,10 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches early_dcx.early_fatal(format!("target file {path:?} does not exist")) }) } @@ -38,7 +38,7 @@ index a622f1b577df..849e9ceee01c 100644 _ => TargetTriple::from_triple(host_triple()), } diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs -index 1d4916cabfdf..4caab818efdb 100644 +index 5584435a0ad9..06107a19948b 100644 --- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs +++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs @@ -9,7 +9,7 @@ pub fn target() -> Target { @@ -48,10 +48,10 @@ index 1d4916cabfdf..4caab818efdb 100644 - llvm_target: "i686-unknown-linux-gnu".into(), + llvm_target: "i686-pc-linux-gnu".into(), metadata: crate::spec::TargetMetadata { - description: None, - tier: None, + description: Some("32-bit Linux (kernel 3.2, glibc 2.17+)".into()), + tier: Some(1), diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs -index bd12d4d8af0e..67ee03d56da4 100644 +index 4a92d4ef9d5c..1618f1656270 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs @@ -26,7 +26,7 @@ pub fn target() -> Target { @@ -61,5 +61,5 @@ index bd12d4d8af0e..67ee03d56da4 100644 - llvm_target: "x86_64-unknown-linux-gnu".into(), + llvm_target: "x86_64-pc-linux-gnu".into(), metadata: crate::spec::TargetMetadata { - description: None, - tier: None, + description: Some("64-bit Linux (kernel 3.2+, glibc 2.17+)".into()), + tier: Some(1), diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index ee7f6e2f0..8e5f38fd3 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -21,7 +21,7 @@ pkgname=( rust-src ) epoch=1 -pkgver=1.80.1 +pkgver=1.81.0 pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency" url=https://www.rust-lang.org/ @@ -65,11 +65,11 @@ source=( 0003-compiler-Change-LLVM-targets.patch 0004-compiler-Use-wasm-ld-for-wasm-targets.patch ) -b2sums=('28dd638a0b10a4c7cc098069ee4026b41f8fcb7abe4bfd4386620b73c236952455efc007d67990845b8d4ccb7541e2011cbfe04ab4eca49427eb0baf6bcc9e1a' +b2sums=('0bc0ae9207306458c6721ddaff0bf56280a4ca4918502b44cfdfc200e73c4a5af88c95f9df53c1fe927f94ffe09d855e21dd6a749331041d719704dc209940ba' 'SKIP' - 'ba3444d558b9428231fd33156fc231b34dc445813c2c849106f0db0a519c26eb8b8f7f2b8b13e9a303949c50611d95b0ffaf4d0bdc7fde640337d04602b03312' - 'b582b6bf142ad574e489d3aec1d8b317b014921fc7d8e28a496576ec08535a595a10491198dd04144bf266cb09cbd6427e313d734f65b04658ca7755051a0997' - '32be97e6fefb20f3d1f16834d3522e22a79e3928e99817418e1f4599d2b5432a9f2d3c09e962c180bb0146d8725949bae24a0dffa7e5bd948a72ffb92d7ca22f' + '074a5ba5b3fcdfa1cab266f8c566129c1851ccbc4a59c0509ae74a58b261e6b8e095034f2c8fdf7615066430c7711ed6ac99da6ef3cdc9c156e8f105fd35f95e' + 'fe4d9352978fc952270bdd70e6607cd9c9fe4047cdd684acfa4ef5b19356e01c007f032b9c5aa75e5ab44be96a394fc44a9cfbb890bb95bca778b1297c1b2ba5' + '9517c41760a5003927793db053892c1abe7b31c9f1b0a36c714c70c987d4badf9a957eac52d5bcd6bd758dc978580c134de74fd6eeb1677a604f184093ee8cc2' '963aa64d27763f063b9fac483a870563f5a71a49ec02d17b7ca0c14dbf67064ba56028bbc45f2ee50b16eada725cb55c2aa2ab17ceadff65ba9e40cb220f7a0c') validpgpkeys=( 108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) @@ -96,7 +96,7 @@ prepare() { profile = "dist" # see src/bootstrap/src/utils/change_tracker.rs -change-id = 123711 +change-id = 127866 [llvm] link-shared = true @@ -115,7 +115,6 @@ tools = [ "rust-analyzer-proc-macro-srv", "analysis", "src", - "rust-demangler", ] sanitizers = false profiler = true @@ -133,6 +132,8 @@ debuginfo-level-std = 0 channel = "stable" description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel" rpath = false +lld = false +use-lld = "external" deny-warnings = false backtrace-on-ice = true jemalloc = true