Bug#564319: micropolis-activity: FTBFS on Lucid sparc: duplicate case value

[Kamal Mostafa]

Package: micropolis-activity
Version: 0.0.20071228-4
Severity: important
Tags: patch
Justification: fails to build from source


This package fails to build on sparc in Ubuntu Lucid:


http://launchpadlibrarian.net/37608066/buildlog_ubuntu-lucid-sparc.micropolis-activity_0.0.20071228-4_FAILEDTOBUILD.txt.gz

gcc -Wall -g -O2 -I. -DTCL_LIBRARY=\"/usr/local/lib/tcl\" -DIS_LINUX -c -o tclunxst.o tclunxst.c
tclunxst.c: In function 'Tcl_SignalId':
tclunxst.c:546: error: duplicate case value
tclunxst.c:534: error: previously used here
tclunxst.c: In function 'Tcl_SignalMsg':
tclunxst.c:678: error: duplicate case value
tclunxst.c:666: error: previously used here


On Sparc, SIGLOST == SIGPWR, so the attached patch guards against that
condition.
-------------- next part --------------
# Author: Kamal Mostafa <kamal at whence.com>
# * Avoid SIGLOST==SIGPWR namespace collision on sparc (LP: #505080).

=== modified file 'src/tcl/tclunxst.c'
--- a/src/tcl/tclunxst.c	2008-12-28 00:18:24 +0000
+++ b/src/tcl/tclunxst.c	2010-01-09 08:29:56 +0000
@@ -530,7 +530,7 @@
 #ifdef SIGKILL
 	case SIGKILL: return "SIGKILL";
 #endif
-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
+#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
 	case SIGLOST: return "SIGLOST";
 #endif
 #ifdef SIGPIPE
@@ -662,7 +662,7 @@
 #ifdef SIGKILL
 	case SIGKILL: return "kill signal";
 #endif
-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT))
+#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGPWR) || (SIGLOST != SIGPWR))
 	case SIGLOST: return "resource lost";
 #endif
 #ifdef SIGPIPE