summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago M. Mola <coldwind@gentoo.org>2008-06-14 15:34:07 +0000
committerSantiago M. Mola <coldwind@gentoo.org>2008-06-14 15:34:07 +0000
commit8f52b4998c767ecc740402b6e13edccd3340576d (patch)
tree46ad6bbcb0ef23b172683646394c38bd6a6dcac1 /games-emulation
parentBug #226505 - For compatibility with phase execution order in (diff)
downloadhistorical-8f52b4998c767ecc740402b6e13edccd3340576d.tar.gz
historical-8f52b4998c767ecc740402b6e13edccd3340576d.tar.bz2
historical-8f52b4998c767ecc740402b6e13edccd3340576d.zip
Ensure we do not use i386 asm on amd64, fixes #222149.
Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25-gentoo-r3 x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/gngeo/ChangeLog7
-rw-r--r--games-emulation/gngeo/Manifest4
-rw-r--r--games-emulation/gngeo/gngeo-0.7.ebuild9
3 files changed, 14 insertions, 6 deletions
diff --git a/games-emulation/gngeo/ChangeLog b/games-emulation/gngeo/ChangeLog
index 5ec2b325c6b3..9f6e3a24cb0b 100644
--- a/games-emulation/gngeo/ChangeLog
+++ b/games-emulation/gngeo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/gngeo
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.19 2007/07/02 16:50:59 nyhm Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/ChangeLog,v 1.20 2008/06/14 15:34:07 coldwind Exp $
+
+ 14 Jun 2008; Santiago M. Mola <coldwind@gentoo.org> gngeo-0.7.ebuild:
+ Ensure we do not use i386 asm on amd64, fixes #222149.
02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
files/gngeo-0.7-execstacks.patch:
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 2b9922782c1e..e11be05bd8d9 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -2,6 +2,6 @@ AUX gngeo-0.7-build.patch 2408 RMD160 d35c087c9866babfb77b92e5ee013bc4d26ed450 S
AUX gngeo-0.7-concurrentMake.patch 512 RMD160 f5a3bf730e0c2c2cd86a525a937171427aa5e699 SHA1 993ed5233ea70da71a57f7dff4ec687b95c0d3fa SHA256 dc16caf67c38ac7a94ebeff1f994216352682d36f82f15f80d962a374902551a
AUX gngeo-0.7-execstacks.patch 2465 RMD160 c51addac07baa440d0be1633a985e6c5c0277a51 SHA1 19068d08171b2700a26c9207176381efad383c3a SHA256 5ddb3327424b6ec92f274e5e0fe38dc90efa1906afd350ab056ba33982dcbf11
DIST gngeo-0.7.tar.gz 853892 RMD160 a55a14d3ce2e3665a55c625688de907f7992548e SHA1 1da0daa0f2af0c3964fc857b68900c46015d09ac SHA256 4c1c56aacede9aceb0d8b2900d7b3edccd2ac6efe7f81a0d3723e998177ab5dc
-EBUILD gngeo-0.7.ebuild 998 RMD160 ebfe3a8021da42c3dd891116dc9464e4af25e655 SHA1 7ba9d619ee067ec32542b493a8f7bfff78d57f9c SHA256 536c078402d275781e4c3f19ef75bdc975c64871c1612951f9f660bbe0a23ce0
-MISC ChangeLog 2585 RMD160 d034c730db918fd500913259295143324461299a SHA1 17575374c0fc2ab2f5502bf81313d2d3faaeddc2 SHA256 efdb28ada9991a8dcad70ac8d00842569eeb9bfbb4376c7fa8c3290ff0246c3d
+EBUILD gngeo-0.7.ebuild 1115 RMD160 b49d48ec3ef39fa35a50a2c52acc76b1075feea9 SHA1 7a97544d8dad8f8366105699249c8c6d4ae8c5f5 SHA256 b361732297c3fbb729f4547e44b4e467f3f555bc636bbaa8ad3bbc37d4fdac35
+MISC ChangeLog 2719 RMD160 21c9375d1d65f8b1311d92902c8321aafb2cac81 SHA1 6f7433913ea7fba49ae810de1dff8170d84707fb SHA256 94c0ad8fd482dfbed056d35450cbf46d75055ac8a3f116680b2f0fd4beb4df92
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-emulation/gngeo/gngeo-0.7.ebuild b/games-emulation/gngeo/gngeo-0.7.ebuild
index 66db03610f19..81f7ff38d428 100644
--- a/games-emulation/gngeo/gngeo-0.7.ebuild
+++ b/games-emulation/gngeo/gngeo-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.4 2007/02/07 13:51:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gngeo/gngeo-0.7.ebuild,v 1.5 2008/06/14 15:34:07 coldwind Exp $
inherit eutils autotools games
@@ -29,6 +29,11 @@ src_unpack() {
eautoreconf
}
+src_compile() {
+ egamesconf $(use_enable x86 i386asm) || die "egamesconf failed"
+ emake || die "emake failed"
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS FAQ NEWS README* TODO sample_gngeorc