File scilab-bin-correct-java9-path.patch of Package scilab
Index: scilab-6.0.2/bin/scilab
===================================================================
--- scilab-6.0.2.orig/bin/scilab
+++ scilab-6.0.2/bin/scilab
@@ -493,12 +493,7 @@ detect_java_vm() {
if test $SCIVERBOSE -ne 0; then
echo "JAVA_HOME : $JAVA_HOME"
fi
-# Manage JRE & JDK because libjava.so and others are stored in the JRE
- if test -d "$JAVA_HOME/jre"; then
- JRE_HOME=$JAVA_HOME/jre
- else
- JRE_HOME=$JAVA_HOME
- fi
+ JRE_HOME=$JAVA_HOME
# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so
case $OS in
@@ -604,7 +599,7 @@ detect_java_vm() {
fi # IS_SCILAB_BINARY
# Check if the lib exists
- LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
+ LIBJAVA="$JRE_HOME/lib/$JAVA_SHLIB"
if test ! -f "$LIBJAVA"; then
if test $SCIVERBOSE -ne 0; then
echo "Cannot find $LIBJAVA"
@@ -613,7 +608,7 @@ detect_java_vm() {
CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
# @TODO This is the default path of the official sun JVM.
# It is different for other implementation of the JVM....
- LD_LIBRARY_PATH="$JRE_HOME/lib/$proc/:$JRE_HOME/lib/$proc/server/:$JRE_HOME/lib/$proc/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ LD_LIBRARY_PATH="$JRE_HOME/lib/:$JRE_HOME/lib/server/:$JRE_HOME/lib/native_threads/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
fi
# Bug http://bugzilla.scilab.org/show_bug.cgi?id=14290 -
@@ -650,7 +645,7 @@ if test $IS_SCILAB_BINARY -eq 1; then
TCL_LIBRARY="$SCIBINARYBASE/thirdparty/tcl8.5"
TK_LIBRARY="$SCIBINARYBASE/thirdparty/tk8.5"
fi
- LD_LIBRARY_PATH=$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:$SCIBINARYBASE/lib/thirdparty/redist
+ LD_LIBRARY_PATH=/usr/lib/scilab:/usr/lib64/scilab/:$SCIBINARYBASE/lib/scilab:$SCIBINARYBASE/lib/thirdparty${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:$SCIBINARYBASE/lib/thirdparty/redist
DOCBOOK_ROOT="$SCI/../../thirdparty/docbook"
PATH="$PATH:$SCI/modules/scicos/"
@@ -832,7 +827,7 @@ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/li
if test -d "$SCI/lib/thirdparty"; then
SCILIB=$SCI/lib/thirdparty:$SCILIB;
fi
-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+# LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
if test -d "$SCI/lib/thirdparty/redist"; then
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCI/lib/thirdparty/redist;
fi
@@ -879,6 +874,7 @@ case $OS in
*)
esac
+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
if test $SCIVERBOSE -ne 0; then
echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
@@ -1182,6 +1178,7 @@ if test "$rest" = "yes"; then
esac
done
+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
# If the argument -a is not provided (extraarg) and we found unknown args
# fail and provide help