summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-03-11 11:21:34 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-03-11 11:21:34 +0000
commit075a13f9fb039c6c320614c12b4cae15df22cc7d (patch)
tree4a8e387ae79e4c29fb3467509aa6a6ca5f262594 /games-fps
parentx86 stable wrt bug #308127 (diff)
downloadgentoo-2-075a13f9fb039c6c320614c12b4cae15df22cc7d.tar.gz
gentoo-2-075a13f9fb039c6c320614c12b4cae15df22cc7d.tar.bz2
gentoo-2-075a13f9fb039c6c320614c12b4cae15df22cc7d.zip
Fix usage of vm for amd64 arch. Bug #255453
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/openarena/ChangeLog6
-rw-r--r--games-fps/openarena/files/openarena-0.8.1-makefile.patch11
2 files changed, 16 insertions, 1 deletions
diff --git a/games-fps/openarena/ChangeLog b/games-fps/openarena/ChangeLog
index f7d54b88645e..cda6afefd604 100644
--- a/games-fps/openarena/ChangeLog
+++ b/games-fps/openarena/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/openarena
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.12 2010/03/10 09:54:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.13 2010/03/11 11:21:33 tupone Exp $
+
+ 11 Mar 2010; Tupone Alfredo <tupone@gentoo.org>
+ files/openarena-0.8.1-makefile.patch:
+ Fix usage of vm for amd64 arch. Bug #255453 by Zeev Tarantov
10 Mar 2010; Tupone Alfredo <tupone@gentoo.org> openarena-0.8.1-r1.ebuild,
+files/openarena-0.8.1-unbundling.patch,
diff --git a/games-fps/openarena/files/openarena-0.8.1-makefile.patch b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
index eb6a6f6a93d6..9c49b9458a7d 100644
--- a/games-fps/openarena/files/openarena-0.8.1-makefile.patch
+++ b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
@@ -1,5 +1,16 @@
--- openarena-engine-0.8.1/Makefile 2008-08-09 22:22:37.000000000 +0200
+++ openarena-engine-0.8.1/Makefile.new 2009-01-07 19:33:31.000000000 +0100
+@@ -67,6 +67,10 @@
+
+ ifndef ARCH
+ ARCH=$(COMPILE_ARCH)
++else
++ ifeq ($(ARCH),amd64)
++ ARCH=x86_64
++ endif
+ endif
+ export ARCH
+
@@ -231,8 +231,7 @@
endif
endif