diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-07-27 19:52:48 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-07-27 19:52:48 +0000 |
| commit | 570170209f7ee73f21d91482b6d89ea4135a773f (patch) | |
| tree | 1e018a182fbdd60bd77b4f8c2d852cfd67e8f4de /games-engines | |
| parent | Fix old version as well. Last one in Portage that's using this flag. Close 22... (diff) | |
| download | gentoo-2-570170209f7ee73f21d91482b6d89ea4135a773f.tar.gz gentoo-2-570170209f7ee73f21d91482b6d89ea4135a773f.tar.bz2 gentoo-2-570170209f7ee73f21d91482b6d89ea4135a773f.zip | |
Fix building with gcc-4.4, bug #273506
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/exult/ChangeLog | 8 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 7 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-gcc44.patch | 21 |
3 files changed, 30 insertions, 6 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index ed670ac0c88b..2d07933ea05c 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/exult -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.23 2009/02/24 19:29:34 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.24 2009/07/27 19:52:47 nyhm Exp $ + + 27 Jul 2009; Tristan Heaven <nyhm@gentoo.org> exult-1.2.ebuild, + +files/exult-1.2-gcc44.patch: + Fix building with gcc-4.4, bug #273506 24 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild: Add timidity use-based dep for bug #203104 diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild index b7b11b4adf01..a55bf8e2ab73 100644 --- a/games-engines/exult/exult-1.2.ebuild +++ b/games-engines/exult/exult-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.18 2009/04/15 22:58:40 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.19 2009/07/27 19:52:47 nyhm Exp $ EAPI=2 inherit eutils autotools multilib games @@ -48,7 +48,8 @@ src_prepare() { "${FILESDIR}"/${P}-gcc41.patch \ "${FILESDIR}"/${P}-64bits.patch \ "${FILESDIR}"/${P}-x11link.patch \ - "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-gcc44.patch sed -i \ -e "s/u7siinstrics.data/u7siintrinsics.data/" \ usecode/ucxt/data/Makefile.am \ @@ -67,8 +68,6 @@ src_configure() { --disable-dependency-tracking \ --disable-tools \ --disable-opengl \ - --disable-3dnow \ - --disable-mmx \ $(use_enable timidity) \ $(use_enable zlib zip-support) } diff --git a/games-engines/exult/files/exult-1.2-gcc44.patch b/games-engines/exult/files/exult-1.2-gcc44.patch new file mode 100644 index 000000000000..056feb25c6c7 --- /dev/null +++ b/games-engines/exult/files/exult-1.2-gcc44.patch @@ -0,0 +1,21 @@ +--- exult.cc ++++ exult.cc +@@ -350,7 +350,7 @@ + add_system_path("<DATA>", "data"); + if(!U7exists("<DATA>/exult.flx")) + { +- char *sep = std::strrchr(runpath,'/'); ++ const char *sep = std::strrchr(runpath,'/'); + if (!sep) sep = std::strrchr(runpath,'\\'); + int plen = sep-runpath; + char *dpath = new char[plen+10]; +--- files/utils.h ++++ files/utils.h +@@ -24,6 +24,7 @@ + + #include <iostream> + #include <string> ++#include <cstdio> + #ifndef ALPHA_LINUX_CXX + # include <iosfwd> + #endif |