From d348ab947fdc4a0adb384457184d6c4655a8a847 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 28 Aug 2007 12:07:49 +0000 Subject: [PATCH] mksignames is not at all cross-compilation-friendly, since it includes the host platform's to build the signal name array from. We use a hand-edited signames.h when cross-compiling for Haiku, now. The shell does now show the correct signal names when having been compiled under Linux. Moreover we avoid bug #1428 (mksignames being broken under FreeBSD). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22092 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/bash/Jamfile | 8 ++++++- src/bin/bash/signames_haiku.h | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/bin/bash/signames_haiku.h diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile index 2dc4313c97..af34fbab24 100644 --- a/src/bin/bash/Jamfile +++ b/src/bin/bash/Jamfile @@ -48,7 +48,13 @@ actions MkSignamesExt1 $(2) $(1) ; } -MkSignamesExt signames.h ; +local signamesHeader = signames.h ; +if $(TARGET_PLATFORM) = haiku { + MakeLocateArch $(signamesHeader) ; + File $(signamesHeader) : [ FGristFiles signames_haiku.h ] ; +} else { + MkSignamesExt $(signamesHeader) ; +} # Haiku supports job control, BeOS doesn't. local jobControlSources ; diff --git a/src/bin/bash/signames_haiku.h b/src/bin/bash/signames_haiku.h new file mode 100644 index 0000000000..96c7aa7f24 --- /dev/null +++ b/src/bin/bash/signames_haiku.h @@ -0,0 +1,39 @@ +/* This file was automatically created by /home/bonefish/develop/haiku/haiku/generated-gcc2/objects/linux/x86/release/bin/bash/mksignames. + Do not edit. Edit support/mksignames.c instead. */ + +/* A translation list so we can be polite to our users. */ +char *signal_names[NSIG + 3] = { + "EXIT", + "SIGHUP", + "SIGINT", + "SIGQUIT", + "SIGILL", + "SIGCHLD", + "SIGABRT", + "SIGPIPE", + "SIGFPE", + "SIGKILL", + "SIGSTOP", + "SIGSEGV", + "SIGCONT", + "SIGTSTP", + "SIGALRM", + "SIGTERM", + "SIGTTIN", + "SIGTTOU", + "SIGUSR1", + "SIGUSR2", + "SIGWINCH", + "SIGKILLTHR", + "SIGTRAP", + "SIGPOLL", + "SIGPROF", + "SIGSYS", + "SIGURG", + "SIGVTALRM", + "SIGXCPU", + "SIGXFSZ", + "DEBUG", + "ERR", + (char *)0x0 +};