Fix compilation with gcc-4.3 and -O2. Bug #26968

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

5 files changed, 33 insertions, 17 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/Manifest b/games-fps/duke3d/Manifest
index dfb8319d69d7..c0efd013d49b 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20040817-credits.patch 1267 RMD160 bef48612e6e7176e1f7a252bfd837f177814e80b SHA1 2ec3f180611c45c7fe29ab2ccaa2d35822dc1ef3 SHA256 ea4d7540790ea937d97d5e87abdfa893e58b699fcb16abb30e84529edce061a9
 AUX 20040817-duke3d-makefile-opts.patch 863 RMD160 49c36fb8f5907f9ac01fd2d9e4a5c192b7ba5fdf SHA1 a726263c6645c228da4fc9cc844a221fa3614ff6 SHA256 afcc1bfc4e3977dbe02b1f390d184b00d8773b1690dce10f4728c535b9c69d56
 AUX 20040817-endian.patch 772 RMD160 b5657806a89846a9280b7ece2aa95b7816249e8b SHA1 c88d5e0e4efb7bdaf507f8f80f116fab1d74c91f SHA256 e0bd07c16123593627e888c102a84af033e906ace3aa3a1559828d83626ec16e
@@ -8,18 +5,12 @@ AUX 20040817-gcc34.patch 1886 RMD160 971968bf75c8151269ee3ca6a326ca780e2470ad SH
 AUX 20040817-gcc4.patch 2169 RMD160 641c45992c2c26447543b9c2175673e9588b71ef SHA1 b892403cb36694e8d6de939194f629a33a8ff79a SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a
 AUX duke3d-20040817-as-needed.patch 2774 RMD160 a08c589c2eb7c8cca8a2660c0587ae079d39080a SHA1 b0da82411173aa3b0378570e0d54c519d33a5753 SHA256 d69ef12868cad9fccf4de6114ff3d127d95219f3417e6f3b8f0f9ce05c1f2e3a
 AUX duke3d-20040817-gcc4.patch 10474 RMD160 a83132ef666d8a78da848ccbb40f16e1250750f6 SHA1 79f26bf9ff0718cca1f9428b93a8808027e214b3 SHA256 010ceb7ff130da74d0f6349a9d12ddc206940d8545499cccb319220ba7d9d585
+AUX duke3d-20040817-noinline.patch 545 RMD160 976f22ebca57d6392b140915244b01d29559a8cf SHA1 9720bdf7e070ca8baa3bb0d595221a9598f1229e SHA256 9d0783517eefc0a1d28189260e91af8318ab1d0395f336ab5f5c72e86504e0fa
 AUX duke3d.cfg 4314 RMD160 8ba6360d6bc24ae353a8c3ad0b973c47d379ea21 SHA1 a6ac127c82aa845ce2afa3657088bd0084335ed8 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556
 AUX network.cfg 398 RMD160 4452e8b8a99f0e08b192f2418ff8324c4bce8a7e SHA1 e9e81a204fd5b470dbd48130cde8e7270ec64eed SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5
 DIST 3dduke13.zip 5924374 RMD160 b2788f0ef7e8e88bcd1c4e56d22cd741109ea59a SHA1 72b832734d72c829cecaffd8d8ae0eb38995aeb3 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
 DIST duke3d-20040817.tar.bz2 1509273 RMD160 d6d4896c6357e21543d68e322f18e8c0c00224d4 SHA1 795b4616c6840023d2f790de3aff2342ef40fa25 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f
-EBUILD duke3d-20040817-r1.ebuild 3462 RMD160 08ba1b796b9497271b4effcfda6a91fcd23b233f SHA1 8e403819b56ca384b7f929e2984d12f56c50332f SHA256 f5c421be36ea0244fc99366a3af9c5cb50bf83f7eb14ecb8aacda7e3c7e61205
-EBUILD duke3d-20040817-r2.ebuild 3392 RMD160 780e85b2e7342559357b55f03f07fb18bb6e84cb SHA1 532ea8fcb75d883c48658a3308d5a0db71482bf8 SHA256 a1b6a52c3a75b427610841452b37e40d8f085b4b674ed8d1d16f00667684182f
-MISC ChangeLog 4690 RMD160 875a2151abef95010352354cb4f2984f5371a17b SHA1 5cd30bebf6adf05f7857e05a2f07f4e18d546551 SHA256 4648621310d0bc7714fc2aec56b978cf2427c6dbb77a6119e65b4e3151291ee7
+EBUILD duke3d-20040817-r1.ebuild 3501 RMD160 0d3d000622f83e015a111a48f4c15aa2cfa5f4a8 SHA1 b4bf7f4a7cb7d1d70e6c2b0a31dd10f6ce452756 SHA256 84cae06cbe78b2bfeb2c03b1a11e2ce9704e1894a52836b61648618edc2c70a4
+EBUILD duke3d-20040817-r2.ebuild 3427 RMD160 cb751d4d4ff65bbf76e273e2b059adf1dc64522e SHA1 ac2bbb99f92e5d8afdb48d367fc4beb90c0c428d SHA256 3fb4f6ee0d515048ca867f320cd74121b9b4ea7b363e339f048395a589a765d0
+MISC ChangeLog 4911 RMD160 2ead16eac8a71d6942dfc6d2a9163a61b0a36894 SHA1 5a8ce6eda79e6c213211d8656421d1ba0223acb5 SHA256 2e1a19396e0e4f5a1ddbafe592602c36c24b1a6f162d2d719d5063bb5327a059
 MISC metadata.xml 2752 RMD160 2df49f93014e1986a8c0875b964576c9e4d9d759 SHA1 8dcc3a18482b31a9ff7d811f5f57809129d2d640 SHA256 5a6d0e402c900b36b4f50a77425c0bb5b078ed3bf8dd1f140551def87dcf2f77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl+A48ACgkQn/5bYzqsSmFKdwCfeLqFAlbzi+x6vvQ1T/78VYjB
-OwgAoLXz6iOgYr4MELdPBXSUYopuVDcm
-=Griq
------END PGP SIGNATURE-----
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;