Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Sun, 31 Jul 2011 18:21:14
Message-Id: 20110731182059.BBE152004B@flycatcher.gentoo.org
1 tommy 11/07/31 18:20:59
2
3 Added: nativebiginteger-0.8.7-build-system.patch
4 nativebiginteger-0.8.7-debug-all.patch
5 nativebiginteger-0.8.7-jcpuid-build-system.patch
6 nativebiginteger-0.8.7-non-android-warnings.patch
7 nativebiginteger-0.8.7-asmfix.patch
8 Log:
9 Version bump, partly based on ebuilds by Dennis Schridde, fixes bug 376971
10
11 (Portage version: 2.2.0_alpha47-r1/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
15
16 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
17 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
18
19 Index: nativebiginteger-0.8.7-build-system.patch
20 ===================================================================
21 --- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig 2011-07-29 11:52:43.000000000 +0200
22 +++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh 2011-07-29 11:53:43.000000000 +0200
23 @@ -3,8 +3,8 @@
24 # When executed in Linux/FreeBSD: Produces an libjbigi.so
25 # Darwin produces libjbigi.jnilib, right?
26
27 -CC="gcc"
28 +test -z "$CC" && CC="gcc"
29
30 case `uname -sr` in
31 MINGW*)
32 JAVA_HOME="c:/software/j2sdk1.4.2_05"
33 @@ -57,5 +55,7 @@
34
35 echo "Compiling C code..."
36 rm -f jbigi.o $LIBFILE
37 -$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
38 -$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
39 +echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
40 +$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
41 +echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
42 +$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
43
44
45
46 1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
47
48 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
49 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
50
51 Index: nativebiginteger-0.8.7-debug-all.patch
52 ===================================================================
53 --- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:14:05.000000000 +0200
54 +++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:15:16.000000000 +0200
55 @@ -481,14 +481,12 @@
56
57 /** @since 0.8.7 */
58 private static void debug(String s) {
59 - I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
60 + System.err.println("DEBUG: " + s);
61 }
62
63
64 private static void info(String s) {
65 - if(_doLog)
66 - System.err.println("INFO: " + s);
67 - I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
68 + System.err.println("INFO: " + s);
69 _loadStatus = s;
70 }
71
72 @@ -496,12 +496,9 @@
73
74 /** @since 0.8.7 */
75 private static void warn(String s, Throwable t) {
76 - if(_doLog) {
77 - System.err.println("WARNING: " + s);
78 - if (t != null)
79 - t.printStackTrace();
80 - }
81 - I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
82 + System.err.println("WARNING: " + s);
83 + if (t != null)
84 + t.printStackTrace();
85 if (t != null)
86 _loadStatus = s + ' ' + t;
87 else
88
89
90
91 1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
92
93 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
94 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
95
96 Index: nativebiginteger-0.8.7-jcpuid-build-system.patch
97 ===================================================================
98 --- i2p-0.8.7/core/c/jcpuid/build.sh.orig 2011-07-29 18:38:44.554000219 +0200
99 +++ i2p-0.8.7/core/c/jcpuid/build.sh 2011-07-29 18:38:13.789000172 +0200
100 @@ -24,8 +24,8 @@
101 mkdir lib/freenet/support
102 mkdir lib/freenet/support/CPUInformation
103
104 -CC="gcc"
105 +test -z "$CC" && CC="gcc"
106
107 case `uname -sr` in
108 MINGW*)
109 JAVA_HOME="/c/software/j2sdk1.4.2_05"
110 @@ -50,8 +52,8 @@
111
112 echo "Compiling C code..."
113 rm -f $LIBFILE
114 -$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
115 -strip $LIBFILE
116 +echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
117 +$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
118 echo Built $LIBFILE
119
120 #g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
121
122
123
124 1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
125
126 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
127 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
128
129 Index: nativebiginteger-0.8.7-non-android-warnings.patch
130 ===================================================================
131 --- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:22:39.000000000 +0200
132 +++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:22:55.000000000 +0200
133 @@ -526,7 +526,7 @@
134 System.loadLibrary(name);
135 return true;
136 } catch (UnsatisfiedLinkError ule) {
137 - if (_isAndroid) {
138 + if (!_isAndroid) {
139 // Unfortunately,
140 // this is not interesting on Android, it says "file not found"
141 // on link errors too.
142
143
144
145 1.1 net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
146
147 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch?rev=1.1&view=markup
148 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
149
150 Index: nativebiginteger-0.8.7-asmfix.patch
151 ===================================================================
152 --- c/jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
153 +++ c/jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500
154 @@ -19,6 +19,7 @@
155 mov d, edx
156 }
157 #else
158 + #ifdef _LP64
159 //Use GCC assembler notation
160 asm
161 (
162 @@ -29,6 +30,20 @@
163 "=d"(d)
164 :"a"(iFunction)
165 );
166 + #elif defined(__i386__)
167 + asm
168 + (
169 + "pushl %%ebx\n\t"
170 + "cpuid\n\t"
171 + "movl %%ebx, %%edi\n\t"
172 + "popl %%ebx"
173 + : "=a" (a),
174 + "=D" (b),
175 + "=c" (c),
176 + "=d" (d)
177 + :"a"(iFunction)
178 + );
179 + #endif
180 #endif
181 return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
182 }
Report Message
Find on MARC Find on Google Groups