Author: fuddl-guest
Date: 2007-05-02 19:29:52 +0000 (Wed, 02 May 2007)
New Revision: 2630
Added:
packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
Modified:
packages/trunk/openarena/debian/changelog
packages/trunk/openarena/debian/patches/00list
Log:
add patch from steve langasek to fix build on alpha
Modified: packages/trunk/openarena/debian/changelog
===================================================================
--- packages/trunk/openarena/debian/changelog 2007-05-01 21:56:00 UTC (rev
2629)
+++ packages/trunk/openarena/debian/changelog 2007-05-02 19:29:52 UTC (rev
2630)
@@ -4,8 +4,10 @@
* Replaced german-english 'ego-shooter' mixture by first-person shooter
(Closes: #411205)
* Fixed bash-specific syntax in the openarena wrapper script (Closes:
#411350)
* Don't dlopen() libcurl
+ * Fix build and resulting binary on alpha. Thanks Steve Langasek for the
+ patch! (Closes: #410555)
- -- Bruno "Fuddl" Kleinert <[EMAIL PROTECTED]> Tue, 1 May 2007 23:28:44 +0200
+ -- Bruno "Fuddl" Kleinert <[EMAIL PROTECTED]> Wed, 2 May 2007 21:28:55 +0200
openarena (0.6.0-2) unstable; urgency=low
Modified: packages/trunk/openarena/debian/patches/00list
===================================================================
--- packages/trunk/openarena/debian/patches/00list 2007-05-01 21:56:00 UTC
(rev 2629)
+++ packages/trunk/openarena/debian/patches/00list 2007-05-02 19:29:52 UTC
(rev 2630)
@@ -1 +1,2 @@
10_fix_buffer_overflow_and_format_string_bug_in_auth_server_response.dpatch
+10_fix_build_and_binary_on_alpha.dpatch
Added:
packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
===================================================================
---
packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
2007-05-01 21:56:00 UTC (rev 2629)
+++
packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
2007-05-02 19:29:52 UTC (rev 2630)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_build_and_binary_on_alpha.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compile options to make oa build and run on alpha.
+
[EMAIL PROTECTED]@
+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,
Property changes on:
packages/trunk/openarena/debian/patches/10_fix_build_and_binary_on_alpha.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
