forked from I2P_Developers/i2p.i2p
zzz
d7e1f62db4
- Fix other jbigi/jcpuid build script errors and typos - Nonzero exit code missing on some jbigi/jcpuid build script failures - Refresh patch
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From: Kill Your TV <killyourtv@i2pmail.org>
|
|
Date: Wed, 11 May 2011 00:12:04 +0000
|
|
Subject: jbigi soname
|
|
|
|
The purpose of this patch is to change the path that build_jbigi.sh
|
|
expects to find the source files at. At the same time I'm specifying
|
|
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 1521392..6a89c92 100755
|
|
--- a/core/c/jbigi/build_jbigi.sh
|
|
+++ b/core/c/jbigi/build_jbigi.sh
|
|
@@ -68,7 +68,7 @@
|
|
BUILD_OS="linux"
|
|
fi
|
|
COMPILEFLAGS="-fPIC -Wall $CFLAGS"
|
|
- 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";;
|
|
*)
|
|
@@ -89,8 +89,8 @@
|
|
[ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
|
|
|
|
echo "Compiling C code..."
|
|
-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
|
|
|