diff options
| -rw-r--r-- | recipes-extended/diffutils/diffutils/sdiff-no-kill.patch | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/recipes-extended/diffutils/diffutils/sdiff-no-kill.patch b/recipes-extended/diffutils/diffutils/sdiff-no-kill.patch index 70e7caf..c9fbc24 100644 --- a/recipes-extended/diffutils/diffutils/sdiff-no-kill.patch +++ b/recipes-extended/diffutils/diffutils/sdiff-no-kill.patch @@ -1,18 +1,32 @@ -"kill" is not supported by mingw, so compile conditionally, -(same condition as another instance of "kill" in the source code). +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Pending -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> +From 56225ecca4f9598c0c9dbd7c46a51dd4816a383f Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 20 Apr 2018 13:39:15 -0700 +Subject: sdiff: port to mingw +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Problem reported by Ross Burton (Bug#31218). +* src/sdiff.c (checksigs): Use ‘raise’, not ‘kill’. +--- + src/sdiff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sdiff.c b/src/sdiff.c +index 1b23a0c..b08bc74 100644 --- a/src/sdiff.c +++ b/src/sdiff.c -@@ -805,7 +805,9 @@ +@@ -805,7 +805,7 @@ checksigs (void) /* Yield an exit status indicating that a signal was received. */ untrapsig (s); -+#if HAVE_WORKING_FORK - kill (getpid (), s); -+#endif +- kill (getpid (), s); ++ raise (s); /* That didn't work, so exit with error status. */ exit (EXIT_TROUBLE); +-- +cgit v1.0-41-gc330 |