forked from I2P_Developers/i2p.i2p
Improved support for GNU/kFreeBSD
- add kFreeBSD to NBI and CPUID - add kFreeBSD to jcpuid/jbigi build scripts - refresh debian patches to compensate for kFreeBSD changes - i2prouter: Detect kFreeBSD and normalize its name - clean up osid (switching to "elif") and adding support for detecting kFreeBSD - update postinstall.sh; I2P cannot be installed using gij so postinstall.sh will not be run. If/when openjdk finally comes to kFreeBSD, we'll be ready for it.
This commit is contained in:
6
debian/patches/0001-path-substitution.patch
vendored
6
debian/patches/0001-path-substitution.patch
vendored
@@ -107,7 +107,7 @@ Debian wrapper.config to try to prevent confusion.
|
||||
if [ -n "$FIXED_COMMAND" ]
|
||||
then
|
||||
COMMAND="$FIXED_COMMAND"
|
||||
@@ -905,9 +856,6 @@
|
||||
@@ -908,9 +859,6 @@
|
||||
# The string passed to eval must handles spaces in paths correctly.
|
||||
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
|
||||
eval $COMMAND_LINE
|
||||
@@ -117,7 +117,7 @@ Debian wrapper.config to try to prevent confusion.
|
||||
else
|
||||
eval echo `gettext '$APP_LONG_NAME is already running.'`
|
||||
exit 1
|
||||
@@ -1031,9 +979,6 @@
|
||||
@@ -1034,9 +982,6 @@
|
||||
# The string passed to eval must handles spaces in paths correctly.
|
||||
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
|
||||
eval $COMMAND_LINE
|
||||
@@ -127,7 +127,7 @@ Debian wrapper.config to try to prevent confusion.
|
||||
else
|
||||
eval echo `gettext '$APP_LONG_NAME is already running.'`
|
||||
exit 1
|
||||
@@ -1874,18 +1819,9 @@
|
||||
@@ -1877,18 +1822,9 @@
|
||||
status
|
||||
;;
|
||||
|
||||
|
6
debian/patches/0002-jbigi-soname.patch
vendored
6
debian/patches/0002-jbigi-soname.patch
vendored
@@ -12,8 +12,8 @@ a soname to shut lintian up.
|
||||
|
||||
--- a/core/c/jbigi/build_jbigi.sh
|
||||
+++ b/core/c/jbigi/build_jbigi.sh
|
||||
@@ -37,7 +37,7 @@
|
||||
UNIXTYPE="solaris"
|
||||
@@ -39,7 +39,7 @@
|
||||
UNIXTYPE="linux"
|
||||
fi
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
|
||||
@@ -21,7 +21,7 @@ a soname to shut lintian up.
|
||||
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
|
||||
LIBFILE="libjbigi.so";;
|
||||
*)
|
||||
@@ -56,7 +56,7 @@
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
echo "Compiling C code..."
|
||||
rm -f jbigi.o $LIBFILE
|
||||
|
10
debian/patches/0003-renaming-jcpuid.patch
vendored
10
debian/patches/0003-renaming-jcpuid.patch
vendored
@@ -8,12 +8,16 @@ Subject: rename jcpuid
|
||||
|
||||
--- a/core/c/jcpuid/build.sh
|
||||
+++ b/core/c/jcpuid/build.sh
|
||||
@@ -65,8 +65,8 @@
|
||||
exit 1;;
|
||||
@@ -67,12 +67,8 @@
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
|
||||
- LIBFILE="lib/freenet/support/CPUInformation/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"
|
||||
+ LIBFILE="../jbigi/libjcpuid.so"
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
|
Reference in New Issue
Block a user