From 34d0f1faa7df667d6ed0395394a81fbedcfac688 Mon Sep 17 00:00:00 2001
From: Eric Long <i@hack3r.moe>
Date: Tue, 8 Aug 2023 16:09:13 +0800
Subject: [PATCH] updpatch: rust 1:1.71.1-1

Fix rotten patch.
---
 rust/jemalloc-sys-pick.patch | 12 --------
 rust/riscv64.patch           | 53 ++++++++++--------------------------
 2 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 rust/jemalloc-sys-pick.patch

diff --git a/rust/jemalloc-sys-pick.patch b/rust/jemalloc-sys-pick.patch
deleted file mode 100644
index 46283ba3f..000000000
--- a/rust/jemalloc-sys-pick.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build.rs b/build.rs
-index b4c0266..612b197 100644
---- a/build.rs
-+++ b/build.rs
-@@ -331,6 +331,7 @@ fn gnu_target(target: &str) -> String {
-         "i686-pc-windows-gnu" => "i686-w64-mingw32".to_string(),
-         "x86_64-pc-windows-gnu" => "x86_64-w64-mingw32".to_string(),
-         "armv7-linux-androideabi" => "arm-linux-androideabi".to_string(),
-+        "riscv64gc-unknown-linux-gnu" => "riscv64-unknown-linux-gnu".to_string(),
-         s => s.to_string(),
-     }
- }
diff --git a/rust/riscv64.patch b/rust/riscv64.patch
index 7a6a906d7..6398f2c66 100644
--- a/rust/riscv64.patch
+++ b/rust/riscv64.patch
@@ -1,5 +1,3 @@
-diff --git PKGBUILD PKGBUILD
-index 99f0b93..56bbbc7 100644
 --- PKGBUILD
 +++ PKGBUILD
 @@ -7,7 +7,6 @@
@@ -18,27 +16,27 @@ index 99f0b93..56bbbc7 100644
    libffi
    lld
    llvm
-@@ -59,6 +57,7 @@ source=(
-   0002-bootstrap-Change-bash-completion-dir.patch
+@@ -60,6 +58,7 @@ source=(
    0003-compiler-Change-LLVM-targets.patch
    0004-compiler-Use-wasm-ld-for-wasm-targets.patch
+   0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch
 +  bump-bootstrap-cc.patch
  )
- b2sums=('43d5ec21eae1c1074c01ae0791940f4976ab2ec8a2754190e6a24cff62d5d29e0469a41e0aff36f264c57b5392042a4f415173a317088148e06f64095920aa34'
+ b2sums=('66c155e7a96d4c21e50feebe412fec0b4f4e3f6566f249a018b439c1e1ad1d807f00bcd854fecc267120db0a6d24939e21c86f46b1b13570b6f589d10f5b83c7'
          'SKIP'
-@@ -66,7 +65,8 @@ b2sums=('43d5ec21eae1c1074c01ae0791940f4976ab2ec8a2754190e6a24cff62d5d29e0469a41
-         'b6c4ad33d54522b2b2f39459877ae05595622e424177e7b6a5e2743058aff3c8bf315b7020eae5460888266700d54c1f59983671aff4da53643bec80cd36b599'
-         '29873e73c52d2c02cfca5b29abc7f2477e98d5cfc3ca1c5c565a04eb925f483ac22dd98a2433a06817742daaa5f3984cc1bd695d3f6b610a41c030be18dd8257'
+@@ -68,7 +67,8 @@ b2sums=('66c155e7a96d4c21e50feebe412fec0b4f4e3f6566f249a018b439c1e1ad1d807f00bcd
+         'fdf2159315b96337da84b45fc49b55ea73d6d14710f3967710da4fcee6d049ef9e5bb18e438e604750f4a3af9c909e58eea143f4a3c497acb7d806f834fd3b44'
          '2ecae93bc6323ef8285b590d576f8b7de385dc121317bd108e1e0863e0ef57d6bd7529564342443b182f1979d2e432a105998da61db16be8e6ea24f79c9acfcd'
--        'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117')
-+        'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117'
+         'e0acea294146ae14ec18ac1f99cb9113dfe0dbe87cfd557fb093b56fc15cf036ac076af905fbe358a11a913d2fc845619c5fd8e18ac97127c232127a28666117'
+-        '13a0d671e86a385237b69d7fda728f04c910eef20fc5c46ba5c4bc6b3defea0d5b34c6744f137c6b4e86d01ad098ac2c4dd0d9a114eb20749f18ffc5d34477ed')
++        '13a0d671e86a385237b69d7fda728f04c910eef20fc5c46ba5c4bc6b3defea0d5b34c6744f137c6b4e86d01ad098ac2c4dd0d9a114eb20749f18ffc5d34477ed'
 +        '2a92f8e5190efd4dca0a36282259caeb7cdd5dcf408c6b90276e6b22cd7a5fce4d7a405e3ca024f84742671e0f98b2ba62b4dc6722bffaa20a76ec99d5d313c1')
  validpgpkeys=(
    108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
  )
-@@ -88,6 +88,9 @@ prepare() {
-   # Use our wasm-ld
-   patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch
+@@ -93,6 +93,9 @@ prepare() {
+   # https://github.com/rust-lang/rust/issues/114444
+   patch -Np1 -i ../0005-bootstrap-Unbreak-building-Rust-1.71.1-with-1.71.0.patch
  
 +  # Bump bootstrap cc to v1.0.77
 +  patch -Np1 -i ../bump-bootstrap-cc.patch
@@ -46,7 +44,7 @@ index 99f0b93..56bbbc7 100644
    cat >config.toml <<END
  profile = "user"
  changelog-seen = 2
-@@ -97,9 +100,8 @@ link-shared = true
+@@ -102,9 +105,8 @@ link-shared = true
  
  [build]
  target = [
@@ -58,7 +56,7 @@ index 99f0b93..56bbbc7 100644
    "wasm32-unknown-unknown",
    "wasm32-wasi",
  ]
-@@ -148,22 +150,18 @@ deny-warnings = false
+@@ -153,22 +155,18 @@ deny-warnings = false
  [dist]
  compression-formats = ["gz"]
  
@@ -85,7 +83,7 @@ index 99f0b93..56bbbc7 100644
  
  [target.wasm32-unknown-unknown]
  sanitizers = false
-@@ -202,15 +200,12 @@ build() {
+@@ -207,15 +205,12 @@ build() {
  
    # rustbuild always installs copies of the shared libraries to /usr/lib,
    # overwrite them with symlinks to the per-architecture versions
@@ -103,26 +101,3 @@ index 99f0b93..56bbbc7 100644
    _pick dest-wasm usr/lib/rustlib/wasm32-*
    _pick dest-src  usr/lib/rustlib/src
  }
-@@ -239,22 +234,6 @@ package_rust() {
-   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)