diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-02-06 08:59:49 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-02-06 08:59:49 +0000 |
| commit | e38ba299353af63b7383e229d744decf360bfddd (patch) | |
| tree | d58f018d70a5584ff05230f2ccab66d21c6d35e6 /games-fps/duke3d | |
| parent | version bump by James Ausmus <james.ausmus@gmail.com>, bug #257850 (diff) | |
| download | gentoo-2-e38ba299353af63b7383e229d744decf360bfddd.tar.gz gentoo-2-e38ba299353af63b7383e229d744decf360bfddd.tar.bz2 gentoo-2-e38ba299353af63b7383e229d744decf360bfddd.zip | |
Fix compilation with gcc-4.3 and -O2. Bug #26968
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64)
Diffstat (limited to 'games-fps/duke3d')
| -rw-r--r-- | games-fps/duke3d/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20040817-r1.ebuild | 5 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20040817-r2.ebuild | 3 | ||||
| -rw-r--r-- | games-fps/duke3d/files/duke3d-20040817-noinline.patch | 18 |
4 files changed, 29 insertions, 4 deletions
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index d759b4be1e25..bd5ebf55ee30 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.30 2009/01/19 18:51:48 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.31 2009/02/06 08:59:49 tupone Exp $ + + 06 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/duke3d-20040817-noinline.patch, duke3d-20040817-r1.ebuild, + duke3d-20040817-r2.ebuild: + Fix compilation with gcc-4.3 and -O2. Bug #26968 by butters@opengames.net 19 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> duke3d-20040817-r2.ebuild: diff --git a/games-fps/duke3d/duke3d-20040817-r1.ebuild b/games-fps/duke3d/duke3d-20040817-r1.ebuild index b1b890d1cd9b..3f67a4c8c7c9 100644 --- a/games-fps/duke3d/duke3d-20040817-r1.ebuild +++ b/games-fps/duke3d/duke3d-20040817-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r1.ebuild,v 1.6 2007/11/20 02:16:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r1.ebuild,v 1.7 2009/02/06 08:59:49 tupone Exp $ fromcvs=0 ECVS_MODULE="duke3d" @@ -71,6 +71,7 @@ src_unpack() { epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4 epatch "${FILESDIR}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P}-noinline.patch sed -i \ -e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \ -e "/^use_physfs := / s:=.*:= false:" \ diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild index 4dd61d7e12a8..27f06c190c49 100644 --- a/games-fps/duke3d/duke3d-20040817-r2.ebuild +++ b/games-fps/duke3d/duke3d-20040817-r2.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-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.6 2009/01/19 18:51:48 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.7 2009/02/06 08:59:49 tupone Exp $ EAPI=2 fromcvs=0 @@ -78,6 +78,7 @@ src_prepare() { "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" \ "${FILESDIR}/${PV}-gcc34.patch" \ "${FILESDIR}"/${P}-gcc4.patch \ + "${FILESDIR}"/${P}-noinline.patch \ "${FILESDIR}"/${P}-as-needed.patch sed -i \ -e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \ diff --git a/games-fps/duke3d/files/duke3d-20040817-noinline.patch b/games-fps/duke3d/files/duke3d-20040817-noinline.patch new file mode 100644 index 000000000000..a41c5c01d063 --- /dev/null +++ b/games-fps/duke3d/files/duke3d-20040817-noinline.patch @@ -0,0 +1,18 @@ +--- source/buildengine/engine.c.old 2009-02-06 09:11:54.000000000 +0100 ++++ source/buildengine/engine.c 2009-02-06 09:19:12.000000000 +0100 +@@ -391,6 +391,7 @@ + modify exact [eax ebx ecx]\ + + #elif (defined __GNUC__) || (defined __ICC) ++ __attribute__ ((noinline)) + static long nsqrtasm(int i1) + { + long retval; +@@ -601,6 +602,7 @@ + + #elif (defined __GNUC__) || (defined __ICC) + ++ __attribute__ ((noinline)) + int setgotpic(long i1) + { + int retval = 0; |