[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: rebased timeout patch
From: |
Eric Blake |
Subject: |
Re: rebased timeout patch |
Date: |
Mon, 2 Jun 2008 13:54:56 +0000 (UTC) |
User-agent: |
Loom/3.14 (http://gmane.org/) |
Jim Meyering <jim <at> meyering.net> writes:
> >>>
> >>> http://www.pixelbeat.org/patches/coreutils-timeout.diff
>
> Thanks again!
> I've tweaked the log message and pushed the result.
This needs a patch before it can build on cygwin and other non-glibc platforms:
gcc -std=gnu99 -gdwarf-2 -Wall -Werror -Wl,--as-needed -o timeout.exe
timeout.o operand2sig.o ../lib/libcoreutils.a /usr/local/lib/libintl.dll.a -
liconv -L/usr/local/lib ../lib/libcoreutils.a
../lib/libcoreutils.a(error.o): In function `error':
/home/eblake/coreutils/lib/error.c:250: undefined reference to `_program_name'
Sounds like a 'make syntax-check' rule on top of this patch would be
worthwhile, although I didn't tackle that...
>From f714d3c1c2ef5944bb12cf567340f487331987b4 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 2 Jun 2008 07:53:26 -0600
Subject: [PATCH] Export program_name, required by gnulib.
* src/timeout.c (program_name): Export.
Signed-off-by: Eric Blake <address@hidden>
---
src/timeout.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/timeout.c b/src/timeout.c
index 19ec849..d7e3441 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -82,7 +82,8 @@ static int timed_out;
static int term_signal = SIGTERM; /* same default as kill command. */
static int monitored_pid;
static int sigs_to_ignore[NSIG]; /* so monitor can ignore sigs it resends.
*/
-static char *program_name;
+
+char *program_name;
static struct option const long_options[] = {
{"signal", required_argument, NULL, 's'},
--
1.5.5.1