* [gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/files/
@ 2019-11-16 9:45 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2019-11-16 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 89b75db4314ab968739dc88bd0cec945a5d7d9ba
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Nov 14 15:13:01 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 09:45:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b75db4
net-libs/nativebiginteger: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13650
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/nativebiginteger-0.8.7-asmfix.patch | 31 -------------------
.../nativebiginteger-0.8.7-build-system.patch | 22 --------------
.../files/nativebiginteger-0.8.7-debug-all.patch | 35 ----------------------
...ativebiginteger-0.8.7-jcpuid-build-system.patch | 23 --------------
...tivebiginteger-0.8.7-non-android-warnings.patch | 11 -------
5 files changed, 122 deletions(-)
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
deleted file mode 100644
index 3443a91c288..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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);
- }
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
deleted file mode 100644
index ea298b5d035..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
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
deleted file mode 100644
index 07dd0522758..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
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
deleted file mode 100644
index a4020a012b9..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 \
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
deleted file mode 100644
index 6240d25bcd9..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/files/
@ 2020-09-13 0:44 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-09-13 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 458bf42448b5f431a1a9a14b4b3fa3b2ee35d445
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Aug 31 23:08:06 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 00:43:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458bf424
net-libs/nativebiginteger: drop old patch
Closes: https://bugs.gentoo.org/728808
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/nativebiginteger-0.9.36-asmfix.patch | 31 ----------------------
1 file changed, 31 deletions(-)
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
deleted file mode 100644
index cdb8c7f64cb..00000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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 related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-13 0:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-13 0:44 [gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-11-16 9:45 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox