#! /bin/sh /usr/share/dpatch/dpatch-run ## 10_fix_build_and_binary_on_alpha.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fix compile options to make oa build and run on alpha. @DPATCH@ diff -urNad openarena-0.6.0~/Makefile openarena-0.6.0/Makefile --- openarena-0.6.0~/Makefile 2007-05-02 21:20:46.000000000 +0200 +++ openarena-0.6.0/Makefile 2007-05-02 21:23:02.973163000 +0200 @@ -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 \ diff -urNad openarena-0.6.0~/code/tools/lcc/cpp/cpp.h openarena-0.6.0/code/tools/lcc/cpp/cpp.h --- openarena-0.6.0~/code/tools/lcc/cpp/cpp.h 2007-05-02 21:20:46.000000000 +0200 +++ openarena-0.6.0/code/tools/lcc/cpp/cpp.h 2007-05-02 21:23:02.973163000 +0200 @@ -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,