summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-10-13 17:10:02 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-10-13 17:10:02 +0000
commit11b38b216608221cfb4a5190d06d76a990832948 (patch)
treea5e0bbe7fe36a5fe7258c55b04dd86e18d47a447 /games-emulation
parentAutomated update of use.local.desc (diff)
downloadhistorical-11b38b216608221cfb4a5190d06d76a990832948.tar.gz
historical-11b38b216608221cfb4a5190d06d76a990832948.tar.bz2
historical-11b38b216608221cfb4a5190d06d76a990832948.zip
fix amd64 building (bug #241504)
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/pcsx2/ChangeLog5
-rw-r--r--games-emulation/pcsx2/Manifest4
-rw-r--r--games-emulation/pcsx2/pcsx2-0.8.1.ebuild9
3 files changed, 13 insertions, 5 deletions
diff --git a/games-emulation/pcsx2/ChangeLog b/games-emulation/pcsx2/ChangeLog
index 1983a4905572..f532053ff199 100644
--- a/games-emulation/pcsx2/ChangeLog
+++ b/games-emulation/pcsx2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/pcsx2
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.14 2008/02/29 19:04:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.15 2008/10/13 17:10:02 mr_bones_ Exp $
+
+ 13 Oct 2008; Michael Sterrett <mr_bones_@gentoo.org> pcsx2-0.8.1.ebuild:
+ fix amd64 building (bug #241504)
29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> pcsx2-0.8.1.ebuild:
Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index fdc70e4f769f..f336f2141e94 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,6 +3,6 @@ AUX pcsx2-0.8.1-amd64.patch 609 RMD160 4eb85b8e5dbd437f0e81abba13236f4df5e4b9f8
AUX pcsx2-0.8.1-gcc41.patch 9314 RMD160 5cff9098516b7d3b9ac4b4eca3a8c3dfe58132c0 SHA1 db9f00476feabace323990492519264adfbea2fe SHA256 ca3a8e3c9dea5758b3694402be38cf7e1504f0413b2f91e147494173c44e296b
AUX pcsx2.png 11497 RMD160 41325b141e0ddfb94a6b6ccd743c665c61ed2ec5 SHA1 3a8dfdbc844c29b2de3eb280c4e3b07bebd03109 SHA256 7c9be27c134253dcb8431fa339bf284da875ba280342a764cb66b3aafe21c2b4
DIST pcsx2-0.8.1src.7z 551500 RMD160 b9241ad6c59a5e62ff556ac5935dec93dca77875 SHA1 a3923a02347550f799f7da1ebf76039acae162f3 SHA256 473f6e278c51770260174026d5c26183dd3ae0083c905a9bedfc2c56321d99e1
-EBUILD pcsx2-0.8.1.ebuild 1671 RMD160 4ff6606e9e210aeef7a3aeb5b84a45b1f7abb5a1 SHA1 411b8b56f8baa31c7e249c77074734a33292eb3f SHA256 b0f0d4ad0dd1d4ea9330e138b048b12669bd4c2603bf3588416fd23833aa0afc
-MISC ChangeLog 1797 RMD160 f83355a054bffa6090dd84a9e58d1353bb91667a SHA1 365cbf8679347ff9b5218010729377cc18e8fb5b SHA256 12b47bd07667b5d69c7afe9292184f62865d4175975bc18c799bd194d33db541
+EBUILD pcsx2-0.8.1.ebuild 1742 RMD160 8c6915d841c613234ae053f28910f28918151cd8 SHA1 f8dc6d134f8b9b9e0a4a84dd11f5319a18b74a83 SHA256 3381c2c8f5b495f1edb1cf45edb250da2b166221bfa9f96ad7415a3ea525a341
+MISC ChangeLog 1912 RMD160 4158276e455d4ea1385bfa826522240add45805e SHA1 fdc3ed625293148018efad51eef2ea12304c3724 SHA256 592b2b3a3630e158f0daa93cbda9522a872a53ae2b186315f4f6455939f4e094
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-emulation/pcsx2/pcsx2-0.8.1.ebuild b/games-emulation/pcsx2/pcsx2-0.8.1.ebuild
index 84abf5665d67..440774b485e7 100644
--- a/games-emulation/pcsx2/pcsx2-0.8.1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-0.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/pcsx2-0.8.1.ebuild,v 1.10 2008/02/29 19:04:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/pcsx2-0.8.1.ebuild,v 1.11 2008/10/13 17:10:02 mr_bones_ Exp $
inherit eutils toolchain-funcs games
@@ -45,7 +45,12 @@ src_unpack() {
}
src_compile() {
- emake -C Linux OPTIMIZE="${CFLAGS}" || die "emake failed"
+ local CPU=i386
+
+ if use amd64; then
+ CPU=x86_64
+ fi
+ emake -C Linux OPTIMIZE="${CFLAGS}" CPU="${CPU}" || die "emake failed"
}
src_install() {