r35718 - /packages/scilab/trunk/debian/patches/z_java_debug.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Fri May 15 06:26:36 UTC 2009
Author: sylvestre-guest
Date: Fri May 15 06:26:35 2009
New Revision: 35718
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35718
Log:
More feedbacks on the java detection
Added:
packages/scilab/trunk/debian/patches/z_java_debug.diff
Added: packages/scilab/trunk/debian/patches/z_java_debug.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/z_java_debug.diff?rev=35718&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/z_java_debug.diff (added)
+++ packages/scilab/trunk/debian/patches/z_java_debug.diff Fri May 15 06:26:35 2009
@@ -1,0 +1,119 @@
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 52c571f..02c9063 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -120,7 +120,7 @@ AC_DEFUN([AC_PROG_JAVAC], [
+ AC_MSG_ERROR([Could not compile simple Java program with '$JAVAC'. Try with the Sun JDK (1.5 or 6).])
+ fi
+
+- AC_MSG_LOG([Using JAVAC=$JAVAC], 1)
++ AC_MSG_LOG([Using JAVAC=$JAVAC])
+ ])
+
+
+@@ -304,7 +304,7 @@ AC_DEFUN([AC_JAVA_CLASSPATH], [
+ ac_java_classpath="${ac_java_classpath}:${CLASSPATH}"
+ fi
+
+- AC_MSG_LOG([Using CLASSPATH=$ac_java_classpath], 1)
++ AC_MSG_LOG([Using CLASSPATH=$ac_java_classpath],1)
+ AC_MSG_RESULT($ac_java_classpath)
+ ])
+
+@@ -430,6 +430,8 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ ;;
+ esac
+
++ AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])
++
+ # Check for known JDK installation layouts
+
+ # Gives the name of the symbol we want to look for.
+@@ -441,9 +443,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=jre/lib/$machine/libjava.so
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+ D=`dirname $ac_java_jvm_dir/$F`
+ ac_java_jvm_jni_lib_runtime_path=$D
+ ac_java_jvm_jni_lib_flags="-L$D -ljava -lverify"
+@@ -469,9 +471,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=jre/lib/amd64/libjava.so
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+
+ D=`dirname $ac_java_jvm_dir/$F`
+ ac_java_jvm_jni_lib_runtime_path=$D
+@@ -487,9 +489,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=jre/lib/i386/client/libjvm.so
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+
+ D=`dirname $ac_java_jvm_dir/$F`
+ ac_java_jvm_jni_lib_runtime_path=$D
+@@ -505,9 +507,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=jre/bin/classic/libjvm.so
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+
+ D=`dirname $ac_java_jvm_dir/$F`
+ ac_java_jvm_jni_lib_runtime_path=$D
+@@ -523,9 +525,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=../Libraries/libjava.jnilib
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+ libSymbolToTest="JNI_GetCreatedJavaVMs_Impl"
+
+ D=`dirname $ac_java_jvm_dir/$F`
+@@ -542,14 +544,14 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+
+ F=lib/jvm.lib
+ if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+- AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Looking for $ac_java_jvm_dir/$F])
+ if test -f $ac_java_jvm_dir/$F ; then
+ # jre/bin/client must contain jvm.dll
+ # jre/bin/server directory could also contain jvm.dll,
+ # just assume the user wants to use the client JVM.
+ DLL=jre/bin/client/jvm.dll
+ if test -f $ac_java_jvm_dir/$DLL ; then
+- AC_MSG_LOG([Found $ac_java_jvm_dir/$F], 1)
++ AC_MSG_LOG([Found $ac_java_jvm_dir/$F])
+ D1=$ac_java_jvm_dir/jre/bin
+ D2=$ac_java_jvm_dir/jre/bin/client
+ ac_java_jvm_jni_lib_runtime_path="${D1}:${D2}"
+@@ -570,8 +572,8 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ AC_MSG_LOG([Using the following JNI library flags $ac_java_jvm_jni_lib_flags])
+ AC_MSG_LOG([Using the following runtime library path $ac_java_jvm_jni_lib_runtime_path])
+
+- AC_MSG_LOG([Using LD_PRELOAD=$ac_java_jvm_ld_preload], 1)
+- AC_MSG_LOG([Using LD_BIND_NOW=$ac_java_jvm_ld_bind_now], 1)
++ AC_MSG_LOG([Using LD_PRELOAD=$ac_java_jvm_ld_preload],1)
++ AC_MSG_LOG([Using LD_BIND_NOW=$ac_java_jvm_ld_bind_now],1)
+
+ # Make sure we can compile and link a trivial JNI program
+
More information about the debian-science-commits
mailing list