Fix building on x86 #152043.

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 54 insertions, 21 deletions

diff --git a/dev-libs/tomsfastmath/ChangeLog b/dev-libs/tomsfastmath/ChangeLog
index a15158c46b99..fa1fe27aa4a7 100644
--- a/dev-libs/tomsfastmath/ChangeLog
+++ b/dev-libs/tomsfastmath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tomsfastmath
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tomsfastmath/ChangeLog,v 1.3 2006/03/19 22:34:45 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tomsfastmath/ChangeLog,v 1.4 2006/10/22 04:04:07 vapier Exp $
+
+  22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/tomsfastmath-0.05-asm-relax-x86.patch, tomsfastmath-0.05.ebuild:
+  Fix building on x86 #152043.
 
   19 Mar 2006; Mark Loeser <halcy0n@gentoo.org> tomsfastmath-0.03.ebuild,
   tomsfastmath-0.05.ebuild:
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 813a9820efcb..293dd2d53c8b 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ee4f9ff8ee0f470f6e5af5b15210886d ChangeLog 635
-RMD160 fec733e371fb059029579a1d99443717eebaac8f ChangeLog 635
-SHA256 0bf979d99c5aadd0f2a848603fc73ebe5b8110d8f550effaca9e975bf27a1b79 ChangeLog 635
-MD5 ae19a99d559ec8356a20eb9af462bf46 files/digest-tomsfastmath-0.03 57
-RMD160 9674935224a95432d1c38a159b4ecd2ae31906ac files/digest-tomsfastmath-0.03 57
-SHA256 47458f50cab18cbbdc83909799fadd3073dc52c4d4dfd36acd790d094da180aa files/digest-tomsfastmath-0.03 57
-MD5 b37ec5a14eb40086a0cbe204c74d4bc0 files/digest-tomsfastmath-0.05 57
-RMD160 7a5240de91f6e83bb8f651a9dcd0ec42c3604daa files/digest-tomsfastmath-0.05 57
-SHA256 836a2f7c3888a38ca330f5cdfe59b29c9c2c3c2a2c1ac975583b2eae1fac715f files/digest-tomsfastmath-0.05 57
+AUX tomsfastmath-0.05-asm-relax-x86.patch 682 RMD160 d1d69e360306aeca12b3164d9cad7ae33a7a3e22 SHA1 6dc2dca214754c0bbdeec2f1a55b621d080e5c97 SHA256 f9a425419f5df0bb61d847f4a43d565f97d82bb54e34d6d93fd22a99c6309f70
+MD5 1fbb46d57c84127f51d2e2d15347d77e files/tomsfastmath-0.05-asm-relax-x86.patch 682
+RMD160 d1d69e360306aeca12b3164d9cad7ae33a7a3e22 files/tomsfastmath-0.05-asm-relax-x86.patch 682
+SHA256 f9a425419f5df0bb61d847f4a43d565f97d82bb54e34d6d93fd22a99c6309f70 files/tomsfastmath-0.05-asm-relax-x86.patch 682
+DIST tfm-0.05.zip 318329 RMD160 2321497af66088bd1935fd83abad3924117b976e SHA1 9ec8d63d8d469dbe7255afa18abea333febe05fe SHA256 62a36a9d7630b299cf2169899b9591b9fd5fa380bfb5272504ff3f4c900d4a09
+EBUILD tomsfastmath-0.05.ebuild 848 RMD160 ca41bad81582113d2b8facec738d71c9b17d6675 SHA1 7a184feb157e06f3acc947359c6e25706e0352ca SHA256 429696212990e122f23566aa0c825fc1ae6b834bc90b6931619b62f1760f40d1
+MD5 0b014c8b66d9d709ba8ed3c63165adaa tomsfastmath-0.05.ebuild 848
+RMD160 ca41bad81582113d2b8facec738d71c9b17d6675 tomsfastmath-0.05.ebuild 848
+SHA256 429696212990e122f23566aa0c825fc1ae6b834bc90b6931619b62f1760f40d1 tomsfastmath-0.05.ebuild 848
+MISC ChangeLog 790 RMD160 73614bcecefe57a2c9109af9c3bd333a817c9538 SHA1 ab9163ac9f7cc00207cec8feb96298019c2ee40c SHA256 3194f163d262d36f014242321ca373f4c7b18c8c398ec7701592569548bf211b
+MD5 c50c8b1cf5648bcd86ef04ce516f114d ChangeLog 790
+RMD160 73614bcecefe57a2c9109af9c3bd333a817c9538 ChangeLog 790
+SHA256 3194f163d262d36f014242321ca373f4c7b18c8c398ec7701592569548bf211b ChangeLog 790
+MISC metadata.xml 595 RMD160 a8691a48b1afb6f063460ebe2af76f335a848672 SHA1 12886cb6e7d43885550a5c5ebee8e2d9047bb27c SHA256 7a6f705028c9052d2d15ac7e8a889c149a51831c06afb4f414cd83eda05e433e
 MD5 8cbe245299db8ecd4ee45d433d33de48 metadata.xml 595
 RMD160 a8691a48b1afb6f063460ebe2af76f335a848672 metadata.xml 595
 SHA256 7a6f705028c9052d2d15ac7e8a889c149a51831c06afb4f414cd83eda05e433e metadata.xml 595
-MD5 fc011d0d83d89f56c13a14949ce54f06 tomsfastmath-0.03.ebuild 686
-RMD160 b5cbd98ac01155dfd52733dfbcadba972609ef8e tomsfastmath-0.03.ebuild 686
-SHA256 1efb463db455209b05043c70bbf7fc3b94388ef4cf4f386881717362b6ce014a tomsfastmath-0.03.ebuild 686
-MD5 6a78be633fcd982b22efe06b21bded4e tomsfastmath-0.05.ebuild 735
-RMD160 bb70bca99e2be7e5a04b8578b891fd721014a2a3 tomsfastmath-0.05.ebuild 735
-SHA256 15cc3d6e63b31b573f2590cffabe221e11116dc900a35c0f906d6b42ce522570 tomsfastmath-0.05.ebuild 735
+MD5 b5673fd1f131513b8aef46930b12f54c files/digest-tomsfastmath-0.05 217
+RMD160 ef511350adb873ebd26a91faa7fea0942f337ff4 files/digest-tomsfastmath-0.05 217
+SHA256 358db3d515662648ae70ea9944eb2152c34c58ac050d6623efcf277389587991 files/digest-tomsfastmath-0.05 217
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEHdyPCRZPokWLroQRAjgFAKCK2qFR/o3SrPH7Zfs24IKj8QwtWwCfXnYW
-eKdKVAJaazy8Ypa8jc7iFzk=
-=8iPq
+iD8DBQFFOu3eamhnQswr0vIRApH+AJ9Hae8za89I43eLXiCGOD7nOqqRyACfUxkH
+ehfisA0hdjNiXASMugjqVLc=
+=Wim7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/tomsfastmath/files/digest-tomsfastmath-0.05 b/dev-libs/tomsfastmath/files/digest-tomsfastmath-0.05
index 772d5e8cd235..0645e832ee03 100644
--- a/dev-libs/tomsfastmath/files/digest-tomsfastmath-0.05
+++ b/dev-libs/tomsfastmath/files/digest-tomsfastmath-0.05
@@ -1 +1,3 @@
 MD5 0b4a0e82c06c5377368c2f6718b7f5f2 tfm-0.05.zip 318329
+RMD160 2321497af66088bd1935fd83abad3924117b976e tfm-0.05.zip 318329
+SHA256 62a36a9d7630b299cf2169899b9591b9fd5fa380bfb5272504ff3f4c900d4a09 tfm-0.05.zip 318329
diff --git a/dev-libs/tomsfastmath/files/tomsfastmath-0.05-asm-relax-x86.patch b/dev-libs/tomsfastmath/files/tomsfastmath-0.05-asm-relax-x86.patch
new file mode 100644
index 000000000000..959dc0246166
--- /dev/null
+++ b/dev-libs/tomsfastmath/files/tomsfastmath-0.05-asm-relax-x86.patch
@@ -0,0 +1,16 @@
+relax input constraints for x86 so gcc doesnt error out:
+fp_mul_comba.c:258: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+
+http://bugs.gentoo.org/152043
+
+--- fp_mul_comba.c
++++ fp_mul_comba.c
+@@ -53,7 +53,7 @@
+      "addl  %%eax,%0     \n\t"                            \
+      "adcl  %%edx,%1     \n\t"                            \
+      "adcl  $0,%2        \n\t"                            \
+-     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
++     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j)  :"%eax","%edx","%cc");
+ 
+ #elif defined(TFM_X86_64)
+ /* x86-64 optimized */
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild
index f7d1128f3c8e..d7d1bc38c5cb 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild,v 1.3 2006/03/19 22:34:45 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tomsfastmath/tomsfastmath-0.05.ebuild,v 1.4 2006/10/22 04:04:07 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="portable fixed precision math library geared towards doing one thing very fast"
 HOMEPAGE="http://libtomcrypt.org/tfm/"
@@ -10,9 +12,16 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE=""
+
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asm-relax-x86.patch #152043
+}
+
 src_compile() {
 	emake IGNORE_SPEED=1 || die
 }