Merging debian version 1.75.0+dfsg1-5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 54 insertions, 0 deletions

diff --git a/debian/patches/u-hurd-tests.patch b/debian/patches/u-hurd-tests.patch
new file mode 100644
index 000000000..15eacdcf2
--- /dev/null
+++ b/debian/patches/u-hurd-tests.patch
@@ -0,0 +1,54 @@
+These tests hang or make the box OOM
+
+Index: rust/tests/ui/associated-consts/issue-93775.rs
+===================================================================
+--- rust.orig/tests/ui/associated-consts/issue-93775.rs
++++ rust/tests/ui/associated-consts/issue-93775.rs
+@@ -1,5 +1,6 @@
+ // build-pass
+ // ignore-tidy-linelength
++// ignore-hurd
+ 
+ // Regression for #93775, needs build-pass to test it.
+ 
+Index: rust/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
+===================================================================
+--- rust.orig/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
++++ rust/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
+@@ -1,5 +1,6 @@
+ // build-pass
+ // ignore-tidy-filelength
++// ignore-hurd
+ #![crate_type = "rlib"]
+ 
+ fn banana(v: &str) -> u32 {
+Index: rust/tests/ui/threads-sendsync/mpsc_stress.rs
+===================================================================
+--- rust.orig/tests/ui/threads-sendsync/mpsc_stress.rs
++++ rust/tests/ui/threads-sendsync/mpsc_stress.rs
+@@ -1,6 +1,7 @@
+ // run-pass
+ // compile-flags:--test
+ // ignore-emscripten
++// ignore-hurd
+ 
+ use std::sync::mpsc::channel;
+ use std::sync::mpsc::TryRecvError;
+Index: rust/tests/run-make/long-linker-command-lines/foo.rs
+===================================================================
+--- rust.orig/tests/run-make/long-linker-command-lines/foo.rs
++++ rust/tests/run-make/long-linker-command-lines/foo.rs
+@@ -44,6 +44,13 @@ fn read_linker_args(path: &Path) -> Stri
+     }
+ }
+ 
++#[cfg(target_os = "hurd")]
++// Debian: test causes build to fail on hurd
++fn main() {
++    return;
++}
++
++#[cfg(not(target_os = "hurd"))]
+ fn main() {
+     let tmpdir = PathBuf::from(env::var_os("TMPDIR").unwrap());
+     let ok = tmpdir.join("ok");