Update patches

diff --git a/debian/patches/d-i686-baseline.patch b/debian/patches/d-i686-baseline.patch
index f71cd508c8656ccf2dfcaed6894f8aed37196b9f..3a8bd9948cd43a6fd436b50a5068de56b070a515 100644 (file)
--- a/debian/patches/d-i686-baseline.patch
+++ b/debian/patches/d-i686-baseline.patch
@@ -1,8 +1,6 @@
-Index: rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-+++ rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target,
+--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
  
  pub fn target() -> Target {
      let mut base = super::linux_gnu_base::opts();
@@ -10,4 +8,4 @@ Index: rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
 +    base.cpu = "pentiumpro".to_string();
      base.max_atomic_width = Some(64);
      base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
-     base.stack_probes = true;
+     // don't use probe-stack=inline-asm until rust-lang/rust#83139 is resolved.

diff --git a/debian/patches/series b/debian/patches/series
index 7c7d2483cc845e2eb514727bd425e32d18d048b0..33bcc023f6a443dae5c2be7f5b5d18b2c2b6e733 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 
 # pending, or forwarded
 u-ignore-gdb-10-failures.patch
-u-update-version-check.patch
 u-reproducible-build.patch
 u-make-tests-work-without-rpath.patch
 u-tests-ignore-arm.patch
@@ -12,7 +11,6 @@ u-ignore-endian-big.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-rustc-llvm-cross-flags.patch
-u-dont-install-libllvm.patch
 u-reproducible-dl-stage0.patch
 
 # Debian-specific patches, not suitable for upstream

diff --git a/debian/patches/u-dont-install-libllvm.patch b/debian/patches/u-dont-install-libllvm.patch
deleted file mode 100644 (file)
index 7b05183..0000000
--- a/debian/patches/u-dont-install-libllvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://github.com/rust-lang/rust/issues/78932
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -2370,7 +2370,8 @@
- /// Note: This function does not yet support Windows, but we also don't support
- ///       linking LLVM tools dynamically on Windows yet.
- fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir: &Path) {
--    if !builder.config.llvm_link_shared {
-+    // Debian does not need to install this
-+    if true {
-         // We do not need to copy LLVM files into the sysroot if it is not
-         // dynamically linked; it is already included into librustc_llvm
-         // statically.

diff --git a/debian/patches/u-update-version-check.patch b/debian/patches/u-update-version-check.patch
deleted file mode 100644 (file)
index 1120685..0000000
--- a/debian/patches/u-update-version-check.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Bug: https://github.com/rust-lang/rust/issues/79010
-
---- a/src/test/ui/feature-gates/feature-gate-cfg-version.stderr
-+++ b/src/test/ui/feature-gates/feature-gate-cfg-version.stderr
-@@ -118,8 +118,14 @@
-    = note: see issue #64796 <https://github.com/rust-lang/rust/issues/64796> for more information
-    = help: add `#![feature(cfg_version)]` to the crate attributes to enable
- 
-+error: invalid version literal
-+  --> $DIR/feature-gate-cfg-version.rs:30:15
-+   |
-+LL | #[cfg(version("1.65536.2"))]
-+   |               ^^^^^^^^^^^
-+
- error[E0658]: `cfg(version)` is experimental and subject to change
--  --> $DIR/feature-gate-cfg-version.rs:40:18
-+  --> $DIR/feature-gate-cfg-version.rs:38:18
-    |
- LL |     assert!(cfg!(version("1.42")));
-    |                  ^^^^^^^^^^^^^^^
-@@ -127,6 +133,13 @@
-    = note: see issue #64796 <https://github.com/rust-lang/rust/issues/64796> for more information
-    = help: add `#![feature(cfg_version)]` to the crate attributes to enable
- 
--error: aborting due to 16 previous errors
-+error[E0425]: cannot find function `version_check_bug` in this scope
-+  --> $DIR/feature-gate-cfg-version.rs:35:5
-+   |
-+LL |     version_check_bug();
-+   |     ^^^^^^^^^^^^^^^^^ not found in this scope
-+
-+error: aborting due to 18 previous errors
- 
--For more information about this error, try `rustc --explain E0658`.
-+Some errors have detailed explanations: E0425, E0658.
-+For more information about an error, try `rustc --explain E0425`.
---- a/src/test/ui/feature-gates/feature-gate-cfg-version.rs
-+++ b/src/test/ui/feature-gates/feature-gate-cfg-version.rs
-@@ -27,14 +27,12 @@
- //~^ ERROR `cfg(version)` is experimental and subject to change
- fn bar() -> bool { true }
- 
--#[cfg(version("1.65536.2"))]
-+#[cfg(version("1.65536.2"))] //~ ERROR: invalid version literal
- //~^ ERROR `cfg(version)` is experimental and subject to change
- fn version_check_bug() {}
- 
- fn main() {
--    // This should fail but due to a bug in version_check `1.65536.2` is interpreted as `1.2`.
--    // See https://github.com/SergioBenitez/version_check/issues/11
--    version_check_bug();
-+    version_check_bug(); //~ ERROR: cannot find function `version_check_bug` in this scope
-     assert!(foo());
-     assert!(bar());
-     assert!(cfg!(version("1.42"))); //~ ERROR `cfg(version)` is experimental and subject to change