From c2e486f72c3b3d2a563d0564f5c517b621e9341b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 29 Apr 2016 15:30:55 +0000
Subject: [PATCH] Debian: Refresh patches after jbigi/jcpuid build script
changes
---
debian/patches/0002-jbigi-soname.patch | 16 +++++++++-------
debian/patches/0003-rename-jcpuid.patch | 12 ++++++------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0002-jbigi-soname.patch b/debian/patches/0002-jbigi-soname.patch
index 416ea47b38..ff1c533bbd 100644
--- a/debian/patches/0002-jbigi-soname.patch
+++ b/debian/patches/0002-jbigi-soname.patch
@@ -13,21 +13,23 @@ diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
index 1521392..6a89c92 100755
--- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh
-@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
- UNIXTYPE="linux"
+@@ -43,7 +43,7 @@
+ BUILD_OS="linux"
fi
COMPILEFLAGS="-fPIC -Wall $CFLAGS"
-- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE} -I/usr/local/include"
-+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE} -I/usr/local/include"
+- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
++ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";;
*)
-@@ -58,7 +58,7 @@ fi
+@@ -64,8 +64,8 @@
+ [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
echo "Compiling C code..."
- rm -f jbigi.o $LIBFILE
+-echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
-$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
++echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c\""
+$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c || exit 1
+ echo "Link: \"$CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH\""
$CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH || exit 1
- exit 0
diff --git a/debian/patches/0003-rename-jcpuid.patch b/debian/patches/0003-rename-jcpuid.patch
index 3afff1bae5..3a7e52fa32 100644
--- a/debian/patches/0003-rename-jcpuid.patch
+++ b/debian/patches/0003-rename-jcpuid.patch
@@ -10,18 +10,18 @@ diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
index 5b63c6c..f39148d 100755
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
-@@ -75,12 +75,8 @@ case `uname -s` in
- exit 0;;
- esac
+@@ -104,12 +104,8 @@
+ exit 1
+ fi
-- LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
+- LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
- if [ $KFREEBSD -eq 1 ]; then
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-kfreebsd.so"
- else
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
- fi
-+ LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
++ LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid.so"
+ LIBFILE="../jbigi/libjcpuid.so"
- COMPILEFLAGS="-fPIC -Wall"
+ CFLAGS="${CFLAGS} -fPIC -Wall"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
esac
--
GitLab