tags 410555 patch
thanks

Hi fuddl,

The attached patch fixes openarena on alpha.  In addition to the two build
problems Falk identified in his bug report, an additional change is needed
to not use -ffast-math when building on alpha, as -ffast-math will cause the
client to die with SIGFPE.

> as openarena uses the ioquauke3 game engine, i looked through their
> information about alpha support. they only support a limited dedicated
> server on the alpha architecture.

Heh, there's no reason the client shouldn't be supported on alpha if it's
already supported on other 64-bit archs, and I've confirmed that the client
does work with this patch applied.  Please apply the patch; if you need a
sponsor for this fix, I'd be happy to help.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u openarena-0.6.0/debian/changelog openarena-0.6.0/debian/changelog
--- openarena-0.6.0/debian/changelog
+++ openarena-0.6.0/debian/changelog
@@ -1,3 +1,11 @@
+openarena (0.6.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix broken alpha build, and disable -ffast-math on alpha so that the
+    client runs in addition to building.  Closes: #410555.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Wed, 02 May 2007 00:52:55 -0700
+
 openarena (0.6.0-2) unstable; urgency=low
 
   [ Bruno "Fuddl" Kleinert ]
only in patch2:
unchanged:
--- openarena-0.6.0.orig/code/tools/lcc/cpp/cpp.h
+++ openarena-0.6.0/code/tools/lcc/cpp/cpp.h
@@ -10,9 +10,7 @@
 #define NULL	0
 #endif
 
-#ifndef __alpha
 typedef unsigned char uchar;
-#endif
 
 enum toktype { END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
 		EQ, NEQ, LEQ, GEQ, LSH, RSH, LAND, LOR, PPLUS, MMINUS,
only in patch2:
unchanged:
--- openarena-0.6.0.orig/Makefile
+++ openarena-0.6.0/Makefile
@@ -176,7 +176,7 @@
   CC=gcc
 
   ifeq ($(ARCH),alpha)
-    ARCH=axp
+    ARCH=alpha
   else
   ifeq ($(ARCH),x86_64)
     LIB=lib64
@@ -238,6 +238,10 @@
     ifneq ($(VM_PPC),)
       HAVE_VM_COMPILED=true
     endif
+  else
+  ifeq ($(ARCH),alpha)
+    OPTIMIZE = -O3 -funroll-loops -fomit-frame-pointer
+  endif
   endif
   endif
   endif
@@ -499,7 +503,7 @@
 ifeq ($(PLATFORM),freebsd)
 
   ifneq (,$(findstring alpha,$(shell uname -m)))
-    ARCH=axp
+    ARCH=alpha
   else #default to i386
     ARCH=i386
   endif #alpha test
@@ -526,7 +530,7 @@
     BASE_CFLAGS += $(shell sdl-config --cflags) -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1
   endif
 
-  ifeq ($(ARCH),axp)
+  ifeq ($(ARCH),alpha)
     CC=gcc
     BASE_CFLAGS += -DNO_VM_COMPILED
     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \

Reply via email to