fixup! Rebase Rust and Cargo patches on 1.72.1

rubdos · rubdos · commit 410362acfd3a · 2023-10-24T16:10:31.000+02:00
diff --git a/0001-Set-proper-llvm-targets.patch b/0001-Set-proper-llvm-targets.patch
@@ -22,6 +22,3 @@ index 0c65b25fe13..43beaed6e7b 100644
  
  # LLVM experimental targets to build support for. These targets are specified in
  # the same format as above, but since these targets are experimental, they are
--- 
-2.42.0
-
diff --git a/0002-Disable-statx-for-all-builds.-JB-50106.patch b/0002-Disable-statx-for-all-builds.-JB-50106.patch
@@ -75,6 +75,3 @@ index fbc7f04ce9a..bf49ad70590 100644
  }
  
  cfg_has_statx! {{
--- 
-2.42.0
-
diff --git a/0003-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch b/0003-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch
@@ -34,6 +34,3 @@ index f97cb3440d2..9b96d0d2e57 100644
      }
  }
  
--- 
-2.42.0
-
diff --git a/0004-Force-the-target-when-building-for-CompileKind-Host.patch b/0004-Force-the-target-when-building-for-CompileKind-Host.patch
@@ -25,6 +25,3 @@ index 31e63c226..976b101fd 100644
      }
  
      opt(
--- 
-2.42.0
-
diff --git a/0005-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch b/0005-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch
@@ -389,6 +389,3 @@ index 0ce93af66ac..04449d859bf 100644
          {
              return Ok(None);
          }
--- 
-2.42.0
-
diff --git a/0006-Scratchbox2-needs-to-be-able-to-tell-cargo-the-defau.patch b/0006-Scratchbox2-needs-to-be-able-to-tell-cargo-the-defau.patch
@@ -28,6 +28,3 @@ index 73d8f89cc..d35f55d11 100644
 +            },
              Some(build_target_config) => dedup(&build_target_config.values(config)?),
          };
--- 
-2.42.0
-
diff --git a/0007-Disable-aarch64-outline-atomics-for-now.patch b/0007-Disable-aarch64-outline-atomics-for-now.patch
@@ -26,6 +26,3 @@ index da246089440..8c5daccc331 100644
              mcount: "\u{1}_mcount".into(),
              max_atomic_width: Some(128),
              supported_sanitizers: SanitizerSet::ADDRESS
--- 
-2.42.0
-
diff --git a/0008-Revert-Use-statx-s-64-bit-times-on-32-bit-linux-gnu.patch b/0008-Revert-Use-statx-s-64-bit-times-on-32-bit-linux-gnu.patch
@@ -251,6 +251,3 @@ index 17b4130c202..4e8dd9a86e7 100644
      pub fn new(tv_sec: i64, tv_nsec: i64) -> SystemTime {
          SystemTime { t: Timespec::new(tv_sec, tv_nsec) }
      }
--- 
-2.42.0
-

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,3 @@ index fbc7f04ce9a..bf49ad70590 100644`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`cfg_has_statx! {{`
`78`		`---`
`79`		`-2.42.0`
`80`		`-`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,3 @@ index f97cb3440d2..9b96d0d2e57 100644`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`---`
`38`		`-2.42.0`
`39`		`-`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,3 @@ index 31e63c226..976b101fd 100644`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`opt(`
`28`		`---`
`29`		`-2.42.0`
`30`		`-`
Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,3 @@ index 0ce93af66ac..04449d859bf 100644`
`389`	`389`	`{`
`390`	`390`	`return Ok(None);`
`391`	`391`	`}`
`392`		`---`
`393`		`-2.42.0`
`394`		`-`
-Original file line number
+Diff line change
 +            },
              Some(build_target_config) => dedup(&build_target_config.values(config)?),
          };
 ---
 -2.42.0
+-
Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,3 @@ index 17b4130c202..4e8dd9a86e7 100644`
`251`	`251`	`pub fn new(tv_sec: i64, tv_nsec: i64) -> SystemTime {`
`252`	`252`	`SystemTime { t: Timespec::new(tv_sec, tv_nsec) }`
`253`	`253`	`}`
`254`		`---`
`255`		`-2.42.0`
`256`		`-`