rebase patch due to (my) recent changes in core/c/jbigi/mbuild_jbigi.sh

This commit is contained in:
kytv
2011-09-21 13:37:44 +00:00
parent 3df7ef0366
commit 597fc5504d

View File

@ -3,7 +3,7 @@ Date: Wed, 11 May 2011 00:12:04 +0000
Subject: jbigi soname
The purpose of this patch is to change the path that mbuild_jbigi.sh
expects to find the source files at. At the same time I'm specifying
expects to find the source files at. At the same time I'm specifying
a soname to shut lintian up.
---
@ -12,26 +12,16 @@ a soname to shut lintian up.
--- a/core/c/jbigi/mbuild_jbigi.sh
+++ b/core/c/jbigi/mbuild_jbigi.sh
@@ -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"
- LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
LIBFILE="libjbigi.so";;
esac
@@ -47,7 +47,7 @@
fi
fi
COMPILEFLAGS="-fPIC -Wall"
- 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";;
*)
@@ -66,7 +66,7 @@
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE