Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/files/
Date: Sat, 16 Nov 2019 09:46:03
Message-Id: 1573897549.89b75db4314ab968739dc88bd0cec945a5d7d9ba.juippis@gentoo
1 commit: 89b75db4314ab968739dc88bd0cec945a5d7d9ba
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 14 15:13:01 2019 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 16 09:45:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b75db4
7
8 net-libs/nativebiginteger: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/13650
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 .../files/nativebiginteger-0.8.7-asmfix.patch | 31 -------------------
15 .../nativebiginteger-0.8.7-build-system.patch | 22 --------------
16 .../files/nativebiginteger-0.8.7-debug-all.patch | 35 ----------------------
17 ...ativebiginteger-0.8.7-jcpuid-build-system.patch | 23 --------------
18 ...tivebiginteger-0.8.7-non-android-warnings.patch | 11 -------
19 5 files changed, 122 deletions(-)
20
21 diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
22 deleted file mode 100644
23 index 3443a91c288..00000000000
24 --- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
25 +++ /dev/null
26 @@ -1,31 +0,0 @@
27 ---- c/jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
28 -+++ c/jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500
29 -@@ -19,6 +19,7 @@
30 - mov d, edx
31 - }
32 - #else
33 -+ #ifdef _LP64
34 - //Use GCC assembler notation
35 - asm
36 - (
37 -@@ -29,6 +30,20 @@
38 - "=d"(d)
39 - :"a"(iFunction)
40 - );
41 -+ #elif defined(__i386__)
42 -+ asm
43 -+ (
44 -+ "pushl %%ebx\n\t"
45 -+ "cpuid\n\t"
46 -+ "movl %%ebx, %%edi\n\t"
47 -+ "popl %%ebx"
48 -+ : "=a" (a),
49 -+ "=D" (b),
50 -+ "=c" (c),
51 -+ "=d" (d)
52 -+ :"a"(iFunction)
53 -+ );
54 -+ #endif
55 - #endif
56 - return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
57 - }
58
59 diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
60 deleted file mode 100644
61 index ea298b5d035..00000000000
62 --- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
63 +++ /dev/null
64 @@ -1,22 +0,0 @@
65 ---- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig 2011-07-29 11:52:43.000000000 +0200
66 -+++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh 2011-07-29 11:53:43.000000000 +0200
67 -@@ -3,8 +3,8 @@
68 - # When executed in Linux/FreeBSD: Produces an libjbigi.so
69 - # Darwin produces libjbigi.jnilib, right?
70 -
71 --CC="gcc"
72 -+test -z "$CC" && CC="gcc"
73 -
74 - case `uname -sr` in
75 - MINGW*)
76 - JAVA_HOME="c:/software/j2sdk1.4.2_05"
77 -@@ -57,5 +55,7 @@
78 -
79 - echo "Compiling C code..."
80 - rm -f jbigi.o $LIBFILE
81 --$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
82 --$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
83 -+echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
84 -+$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
85 -+echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
86 -+$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
87
88 diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
89 deleted file mode 100644
90 index 07dd0522758..00000000000
91 --- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
92 +++ /dev/null
93 @@ -1,35 +0,0 @@
94 ---- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:14:05.000000000 +0200
95 -+++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:15:16.000000000 +0200
96 -@@ -481,14 +481,12 @@
97 -
98 - /** @since 0.8.7 */
99 - private static void debug(String s) {
100 -- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
101 -+ System.err.println("DEBUG: " + s);
102 - }
103 -
104 -
105 - private static void info(String s) {
106 -- if(_doLog)
107 -- System.err.println("INFO: " + s);
108 -- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
109 -+ System.err.println("INFO: " + s);
110 - _loadStatus = s;
111 - }
112 -
113 -@@ -496,12 +496,9 @@
114 -
115 - /** @since 0.8.7 */
116 - private static void warn(String s, Throwable t) {
117 -- if(_doLog) {
118 -- System.err.println("WARNING: " + s);
119 -- if (t != null)
120 -- t.printStackTrace();
121 -- }
122 -- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
123 -+ System.err.println("WARNING: " + s);
124 -+ if (t != null)
125 -+ t.printStackTrace();
126 - if (t != null)
127 - _loadStatus = s + ' ' + t;
128 - else
129
130 diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
131 deleted file mode 100644
132 index a4020a012b9..00000000000
133 --- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
134 +++ /dev/null
135 @@ -1,23 +0,0 @@
136 ---- i2p-0.8.7/core/c/jcpuid/build.sh.orig 2011-07-29 18:38:44.554000219 +0200
137 -+++ i2p-0.8.7/core/c/jcpuid/build.sh 2011-07-29 18:38:13.789000172 +0200
138 -@@ -24,8 +24,8 @@
139 - mkdir lib/freenet/support
140 - mkdir lib/freenet/support/CPUInformation
141 -
142 --CC="gcc"
143 -+test -z "$CC" && CC="gcc"
144 -
145 - case `uname -sr` in
146 - MINGW*)
147 - JAVA_HOME="/c/software/j2sdk1.4.2_05"
148 -@@ -50,8 +52,8 @@
149 -
150 - echo "Compiling C code..."
151 - rm -f $LIBFILE
152 --$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
153 --strip $LIBFILE
154 -+echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
155 -+$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
156 - echo Built $LIBFILE
157 -
158 - #g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
159
160 diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
161 deleted file mode 100644
162 index 6240d25bcd9..00000000000
163 --- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
164 +++ /dev/null
165 @@ -1,11 +0,0 @@
166 ---- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:22:39.000000000 +0200
167 -+++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:22:55.000000000 +0200
168 -@@ -526,7 +526,7 @@
169 - System.loadLibrary(name);
170 - return true;
171 - } catch (UnsatisfiedLinkError ule) {
172 -- if (_isAndroid) {
173 -+ if (!_isAndroid) {
174 - // Unfortunately,
175 - // this is not interesting on Android, it says "file not found"
176 - // on link errors too.