forked from I2P_Developers/i2p.i2p
improvements to jbigi scripts
support for Solaris (tested with Solaris 11 x86) mbuild-all.sh: - output correctly formatted file names (tested in Solaris x86, FreeBSD (x86 and x64) and Linux (x86 & x64)) - switch from echo -e to the more portable printf - more error checking, comments debian/patches: refreshed based on changes to core/c/* libjcpuid-x86_64-solaris.so: built in solaris 11 x86 with java 1.7.0_07 and gcc 4.5.2, stripped
This commit is contained in:
8
debian/patches/0002-jbigi-soname.patch
vendored
8
debian/patches/0002-jbigi-soname.patch
vendored
@@ -9,20 +9,18 @@ a soname to shut lintian up.
|
||||
core/c/jbigi/build_jbigi.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
|
||||
index b1a68dd..99b31e4 100755
|
||||
--- a/core/c/jbigi/build_jbigi.sh
|
||||
+++ b/core/c/jbigi/build_jbigi.sh
|
||||
@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
|
||||
@@ -39,7 +39,7 @@
|
||||
UNIXTYPE="linux"
|
||||
fi
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
COMPILEFLAGS="-fPIC -Wall $CFLAGS"
|
||||
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
|
||||
+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
|
||||
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
|
||||
LIBFILE="libjbigi.so";;
|
||||
*)
|
||||
@@ -58,7 +58,7 @@ fi
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
echo "Compiling C code..."
|
||||
rm -f jbigi.o $LIBFILE
|
||||
|
4
debian/patches/0003-renaming-jcpuid.patch
vendored
4
debian/patches/0003-renaming-jcpuid.patch
vendored
@@ -6,11 +6,9 @@ Subject: rename jcpuid
|
||||
core/c/jcpuid/build.sh | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
|
||||
index f3fc9c2..cbd0934 100755
|
||||
--- a/core/c/jcpuid/build.sh
|
||||
+++ b/core/c/jcpuid/build.sh
|
||||
@@ -67,12 +67,8 @@ case `uname -s` in
|
||||
@@ -74,12 +74,8 @@
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
|
Reference in New Issue
Block a user