* [gentoo-commits] gentoo-x86 commit in net-libs/nativebiginteger/files: nativebiginteger-0.8.7-build-system.patch nativebiginteger-0.8.7-debug-all.patch nativebiginteger-0.8.7-jcpuid-build-system.patch nativebiginteger-0.8.7-non-android-warnings.patch nativebiginteger-0.8.7-asmfix.patch
@ 2011-07-31 18:20 Thomas Sachau (tommy)
0 siblings, 0 replies; only message in thread
From: Thomas Sachau (tommy) @ 2011-07-31 18:20 UTC (permalink / raw
To: gentoo-commits
tommy 11/07/31 18:20:59
Added: nativebiginteger-0.8.7-build-system.patch
nativebiginteger-0.8.7-debug-all.patch
nativebiginteger-0.8.7-jcpuid-build-system.patch
nativebiginteger-0.8.7-non-android-warnings.patch
nativebiginteger-0.8.7-asmfix.patch
Log:
Version bump, partly based on ebuilds by Dennis Schridde, fixes bug 376971
(Portage version: 2.2.0_alpha47-r1/cvs/Linux x86_64)
Revision Changes Path
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch?rev=1.1&content-type=text/plain
Index: nativebiginteger-0.8.7-build-system.patch
===================================================================
--- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig 2011-07-29 11:52:43.000000000 +0200
+++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh 2011-07-29 11:53:43.000000000 +0200
@@ -3,8 +3,8 @@
# When executed in Linux/FreeBSD: Produces an libjbigi.so
# Darwin produces libjbigi.jnilib, right?
-CC="gcc"
+test -z "$CC" && CC="gcc"
case `uname -sr` in
MINGW*)
JAVA_HOME="c:/software/j2sdk1.4.2_05"
@@ -57,5 +55,7 @@
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE
-$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
-$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
+echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
+$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
+echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
+$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch?rev=1.1&content-type=text/plain
Index: nativebiginteger-0.8.7-debug-all.patch
===================================================================
--- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:14:05.000000000 +0200
+++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:15:16.000000000 +0200
@@ -481,14 +481,12 @@
/** @since 0.8.7 */
private static void debug(String s) {
- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
+ System.err.println("DEBUG: " + s);
}
private static void info(String s) {
- if(_doLog)
- System.err.println("INFO: " + s);
- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
+ System.err.println("INFO: " + s);
_loadStatus = s;
}
@@ -496,12 +496,9 @@
/** @since 0.8.7 */
private static void warn(String s, Throwable t) {
- if(_doLog) {
- System.err.println("WARNING: " + s);
- if (t != null)
- t.printStackTrace();
- }
- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
+ System.err.println("WARNING: " + s);
+ if (t != null)
+ t.printStackTrace();
if (t != null)
_loadStatus = s + ' ' + t;
else
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch?rev=1.1&content-type=text/plain
Index: nativebiginteger-0.8.7-jcpuid-build-system.patch
===================================================================
--- i2p-0.8.7/core/c/jcpuid/build.sh.orig 2011-07-29 18:38:44.554000219 +0200
+++ i2p-0.8.7/core/c/jcpuid/build.sh 2011-07-29 18:38:13.789000172 +0200
@@ -24,8 +24,8 @@
mkdir lib/freenet/support
mkdir lib/freenet/support/CPUInformation
-CC="gcc"
+test -z "$CC" && CC="gcc"
case `uname -sr` in
MINGW*)
JAVA_HOME="/c/software/j2sdk1.4.2_05"
@@ -50,8 +52,8 @@
echo "Compiling C code..."
rm -f $LIBFILE
-$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
-strip $LIBFILE
+echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
+$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
echo Built $LIBFILE
#g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch?rev=1.1&content-type=text/plain
Index: nativebiginteger-0.8.7-non-android-warnings.patch
===================================================================
--- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:22:39.000000000 +0200
+++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:22:55.000000000 +0200
@@ -526,7 +526,7 @@
System.loadLibrary(name);
return true;
} catch (UnsatisfiedLinkError ule) {
- if (_isAndroid) {
+ if (!_isAndroid) {
// Unfortunately,
// this is not interesting on Android, it says "file not found"
// on link errors too.
1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch?rev=1.1&content-type=text/plain
Index: nativebiginteger-0.8.7-asmfix.patch
===================================================================
--- c/jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
+++ c/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);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-31 18:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-31 18:20 [gentoo-commits] gentoo-x86 commit in net-libs/nativebiginteger/files: nativebiginteger-0.8.7-build-system.patch nativebiginteger-0.8.7-debug-all.patch nativebiginteger-0.8.7-jcpuid-build-system.patch nativebiginteger-0.8.7-non-android-warnings.patch nativebiginteger-0.8.7-asmfix.patch Thomas Sachau (tommy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox