Revision bump, fix asm code for x86, fix linking order, fixes bug 349784

Package-Manager: portage-2.2.0_alpha10-r1/cvs/Linux x86_64

5 files changed, 55 insertions, 18 deletions

diff --git a/net-libs/nativebiginteger/ChangeLog b/net-libs/nativebiginteger/ChangeLog
index 1ffd461334c4..0f4a9487283e 100644
--- a/net-libs/nativebiginteger/ChangeLog
+++ b/net-libs/nativebiginteger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/nativebiginteger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/ChangeLog,v 1.5 2010/09/12 14:31:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/ChangeLog,v 1.6 2010/12/28 12:34:30 tommy Exp $
+
+*nativebiginteger-0.6.4-r3 (28 Dec 2010)
+
+  28 Dec 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -nativebiginteger-0.6.4-r2.ebuild, +nativebiginteger-0.6.4-r3.ebuild,
+  +files/nativebiginteger-0.6.4-asmfix.patch,
+  files/nativebiginteger-0.6.4-ldflags.patch:
+  Revision bump, fix asm code for x86, fix linking order, fixes bug 349784
 
 *nativebiginteger-0.6.4-r2 (12 Sep 2010)
 
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 67e9b8db7a30..3e3a771f8a72 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nativebiginteger-0.6.4-ldflags.patch 942 RMD160 8551096cf96efd921b56d7ee3e752a17369b420f SHA1 cf471d425cef1a0048fcda8aa290a5fb5c8a69be SHA256 15dbf9d168e1d19e9f169fdee7179f1bf2cdaaefbaba7cda84264d2f1bb0e635
+AUX nativebiginteger-0.6.4-asmfix.patch 586 RMD160 bf9d3735089402903777cc119cf56da83839c6f1 SHA1 9574a780ee0d2998eff2aa25f7d7c6e6e78ba146 SHA256 2ad29016057f3ea18596bff1eb47bc1ef6b4cc129d1f3b55d134f2717b8e631a
+AUX nativebiginteger-0.6.4-ldflags.patch 967 RMD160 4f7cb1d44df2d3db41e51b5249da65d898a8fada SHA1 c4b363e75c8d203f94172d0c65bb45d92dd04489 SHA256 9e30b7ef2a4c8e55ce9dcacdc4d19ed76e8249f4af540094543f3aae3e27838a
 DIST nativebiginteger-0.6.4.tar.bz2 10248 RMD160 a7ac7832371c74a1e9592a9abd1b6d5ef40a360a SHA1 37b433b3a7a2cf818a7ca3713548153f63da3817 SHA256 ef36fb57c1d885164f00b3e5d239c22349a530fa20df652efc5cb1f1ccea2c32
-EBUILD nativebiginteger-0.6.4-r2.ebuild 907 RMD160 f642bcc2380ef09a9d9f7fdf581a8058f3611883 SHA1 69063380052e50aa1148fd65733fe98862a92df4 SHA256 e9887164d1b304fca452ae5f13b85e5d915d4359321ffeaf511379b9931ff28c
+EBUILD nativebiginteger-0.6.4-r3.ebuild 867 RMD160 5c87ea56c8e81302121c057f5e72c65cc68eb8bb SHA1 f1df5a12ee59b2a3ccda03f3b27b6976f6275623 SHA256 30f2a7e27ede87d44acd82675f6b3c9469d227619f5c2c354910a684937ee18b
 EBUILD nativebiginteger-0.6.4.ebuild 786 RMD160 a4034c175976d8c3ccd0c1f3b87fcf5dca06fa14 SHA1 7e479d833c9c045f72350c502c8e7ec6ebde269d SHA256 6739e7cc8119bcd19d0272b6a89cbc86df39aa3e105d685f08c81e665b71c2ed
-MISC ChangeLog 1102 RMD160 2087361dbc26a307b8d322d2c324964408ff90a2 SHA1 673fce84490da7fad57ce398fd6ce7280245f6ea SHA256 2061102ed5962d83594c1e76c33ca7454ae9f644ccf80e1e561a72010d7a7cfd
+MISC ChangeLog 1443 RMD160 ca3a9a249f2df36fc271d9ae1d6268ad52e2c149 SHA1 4034687c8877378411249be4cf87e1d146bc0982 SHA256 38a5eca646b24bc73f1a0e30920c8827bdebb8a7a4779132084cc3e563a7c7bc
 MISC metadata.xml 265 RMD160 8391b845c1dc290dbfc6d8391aed1e0537e14725 SHA1 98eb1209de8c64009ada779e9c4b57f0b8273c41 SHA256 02b8c461c4f564f9a88d09d6e5d6cb1018b06173aa6b0fb4f188664b00f057fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkyM5IIACgkQG7kqcTWJkGcurQP/RBQqFvc6cD/83TQoiFGmBJoC
-AUj03+SNeGB16+fZH9rCSWiUCiRg1HUW7wWkSZLrWEYFpZsij8/iqjjmP5bY64ds
-6i4Kd0+38b8oKf1qYcvmeoPg0ZP9BVB/UtFmXpBVwf5O/b5A/Vg+XI8mc5yvZM+Y
-jT+WR3rIG9cjJoBpH50=
-=GEhD
+iJwEAQECAAYFAk0Z2jgACgkQG7kqcTWJkGfMnQQAxSMNJaKshZ4aO63qUNMxdB0J
+zEF1h6JQ27dk8cJI5j1OEEnpJOyQ4NngppXKpeuwLEYuqrEK5rmqBY8jfjw6OpYe
+chzfyopHzL+3qpi98CVazum1LfVuTdMbZe/6gxBsFPNyax3mZHfJo9TgBeViqLZ/
+9bsw33UcxTz3PiAAhR8=
+=AmoP
 -----END PGP SIGNATURE-----
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
new file mode 100644
index 000000000000..04cfa599413a
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
@@ -0,0 +1,31 @@
+--- jcpuid/src/jcpuid.c	2008-10-06 09:44:53.000000000 -0400
++++ jcpuid/src/jcpuid.c.new2	2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ 			mov d, edx
+ 		}
+ 	#else
++	#ifdef _LP64
+ 		//Use GCC assembler notation
+ 		asm 
+ 		(
+@@ -29,6 +30,20 @@
+ 			  "=d"(d)
+ 			:"a"(iFunction)
+ 		);
++	#elif defined(__i386__)
++		asm 
++		(
++			"pushl %%ebx\n\t"
++			"cpuid\n\t"
++			"movl %%ebx, %%edi\n\t"
++			"popl %%ebx"
++			: "=a" (a),
++			  "=D" (b),
++			  "=c" (c),
++			  "=d" (d)
++			:"a"(iFunction)
++		);
++	#endif
+ 	#endif
+ 	return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
index c9638a7d0bb4..5d3c84cd641e 100644
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
@@ -1,11 +1,12 @@
 --- Makefile	2008-11-06 21:09:54.000000000 +0100
-+++ Makefile.new	2010-09-04 21:48:57.941604821 +0200
++++ Makefile.new	2010-12-27 14:26:45.000000000 +0100
 @@ -1,11 +1,11 @@
  libjbigi:
  	cd jbigi && rm -f jbigi.o libjbigi.so && $(CC) $(CFLAGS) -c -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
 -	jbigi/src/jbigi.c && $(CC) -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
-+	jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
- 	-o libjbigi.so jbigi.o
+-	-o libjbigi.so jbigi.o
++	jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so jbigi.o -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
++	-o libjbigi.so
  
  
  libjcpuid:
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.4-r2.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
index dfbe761662ab..1c200bd5f772 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.6.4-r2.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/nativebiginteger-0.6.4-r2.ebuild,v 1.2 2010/09/12 14:32:13 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild,v 1.1 2010/12/28 12:34:30 tommy Exp $
 
 EAPI=2
 
@@ -19,12 +19,8 @@ DEPEND="dev-libs/gmp
 	>=virtual/jdk-1.4"
 RDEPEND="dev-libs/gmp"
 
-pkg_setup() {
-	append-ldflags $(no-as-needed)
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-{asmfix,ldflags}.patch
 }
 
 src_compile() {