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

(Portage version: 2.2.0_alpha10-r1/cvs/Linux x86_64)

4 files changed, 46 insertions, 10 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/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() {