Drop 0002-Do-not-expect-EINTR-when-sleep-is-interrupted-on-GNU.patch (applied upstream)

ci/unstable
Timo Röhling 1 year ago
parent 50ff29688e
commit c512c6d3b1

@ -1,26 +0,0 @@
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 8 Dec 2023 10:15:27 +0100
Subject: Do not expect EINTR when sleep is interrupted on GNU/Hurd
Previously `RunCMake.CTestTimeout` failed on GNU/Hurd because the
`sleep` command does not set `errno` to `EINTR` when interrupted by a
signal, which is a Linux-specific feature.
Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9052
---
Tests/RunCMake/CTestTimeout/TestTimeout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tests/RunCMake/CTestTimeout/TestTimeout.c b/Tests/RunCMake/CTestTimeout/TestTimeout.c
index 425548c..da397f8 100644
--- a/Tests/RunCMake/CTestTimeout/TestTimeout.c
+++ b/Tests/RunCMake/CTestTimeout/TestTimeout.c
@@ -45,7 +45,7 @@ int main(void)
#if defined(_WIN32)
Sleep((TIMEOUT + 4) * 1000);
#elif defined(SIGNAL_IGNORE)
-# if defined(__CYGWIN__) || defined(__sun__)
+# if defined(__CYGWIN__) || defined(__sun__) || defined(__GNU__)
# define ERRNO_IS_EINTR (errno == EINTR || errno == 0)
# else
# define ERRNO_IS_EINTR (errno == EINTR)

@ -1,2 +1 @@
0001-Prefer-default-Python-version.patch 0001-Prefer-default-Python-version.patch
0002-Do-not-expect-EINTR-when-sleep-is-interrupted-on-GNU.patch

Loading…
Cancel
Save