I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Debian: Refactor jcpuid & jbigi patches to deal with SunOS support

Browse Source
This commit is contained in:
kytv
2011-05-31 11:32:07 +00:00
parent 527c9ba5dd
commit 43ba27126c
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch vendored
View File

@ -6,12 +6,18 @@ Subject: Update path of jbigi and add soname
core/c/jbigi/mbuild_jbigi.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/c/jbigi/mbuild_jbigi.sh b/core/c/jbigi/mbuild_jbigi.sh
index 1e262a6..7581335 100755
--- a/core/c/jbigi/mbuild_jbigi.sh
+++ b/core/c/jbigi/mbuild_jbigi.sh
@@ -25,8 +25,8 @@ Darwin*)
@@ -25,14 +25,14 @@
LIBFILE="libjbigi.jnilib";;
SunOS*)
COMPILEFLAGS="-fPIC -Wall"
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
- LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
LIBFILE="libjbigi.so";;
*)
COMPILEFLAGS="-fPIC -Wall"
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
@ -21,7 +27,7 @@ index 1e262a6..7581335 100755
LIBFILE="libjbigi.so";;
esac
@@ -41,7 +41,7 @@ fi
@@ -47,7 +47,7 @@
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE
@ -30,4 +36,3 @@ index 1e262a6..7581335 100755
$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS || exit 1
exit 0
--

11
debian/patches/0007-rename-jcpuid.patch vendored
View File

@ -8,7 +8,16 @@ Subject: rename jcpuid
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
@@ -39,8 +39,8 @@
@@ -37,7 +37,7 @@
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
+ LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
FreeBSD*)
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
@@ -46,8 +46,8 @@
*kFreeBSD*|Linux*)
COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"