r35816 - in /packages/scilab/trunk/debian: changelog patches/z_mipsel_arm_mgmt.diff rules

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Tue Sep  8 22:31:13 2009
New Revision: 35816

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35816
Log:
 mipsel and armel management added (z_mipsel_arm_mgmt.diff patch added)

Added:
    packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/rules

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35816&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Sep  8 22:31:13 2009
@@ -1,3 +1,9 @@
+scilab (5.1.1-9) unstable; urgency=low
+
+  * mipsel and armel management added (z_mipsel_arm_mgmt.diff patch added)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 09 Sep 2009 00:28:10 +0200
+
 scilab (5.1.1-8) unstable; urgency=low
 
   * Update libs_by_debian.m4 which is the libs.m4 of autoconf 2.64 

Added: packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff?rev=35816&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff (added)
+++ packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff Tue Sep  8 22:31:13 2009
@@ -1,0 +1,56 @@
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 02c9063..24c124d 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -425,6 +425,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 	    powerpc|ppc64)
+ 	  	  machine=ppc
+ 		  ;;
++		  armv4l|armv5tel)
++		  machine=arm
++		  ;;
+ 		  s390x) # s390 arch can also returns s390x
+ 		  machine=s390
+ 		  ;;
+@@ -528,7 +531,7 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+             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])
+-		libSymbolToTest="JNI_GetCreatedJavaVMs_Impl"
++				libSymbolToTest="JNI_GetCreatedJavaVMs_Impl"
+ 
+                 D=`dirname $ac_java_jvm_dir/$F`
+                 ac_java_jvm_jni_lib_runtime_path=$D
+@@ -561,6 +564,32 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+         fi
+     fi
+ 
++        # Under GNU/Debian on a mipsel CPU, uname -m is still returning mips
++		# causing a confusion with mips... Therefor, I have to hardcode this 
++		# test
++		# Note that most of the code is duplicated from
++        # Sun/Blackdown 1.4 for Linux (client JVM) tests
++        F=jre/lib/mipsel/libjava.so
++        if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
++            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])
++                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"
++                D=$ac_java_jvm_dir/jre/lib/mipsel/client
++		if test ! -f $D/libjvm.so; then # Check if it is in the client or server directory
++			# Try the server directory
++			D=$ac_java_jvm_dir/jre/lib/mipsel/server
++		fi
++                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
++                D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
++                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++            fi
++        fi
++
+     # Generate error for unsupported JVM layout
+ 
+     if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35816&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Sep  8 22:31:13 2009
@@ -9,7 +9,7 @@
 # Detect the arch (with the naming of Sun)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64 armel=arm
+archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64 armel=arm mips=mips mipsel=mipsel
 archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
 			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))