r35818 - /packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff

Tue Sep 8 22:42:14 UTC 2009

Author: sylvestre-guest
Date: Tue Sep  8 22:42:14 2009
New Revision: 35818

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35818
Log:
no color

Modified:
    packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff

Modified: 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=35818&op=diff
==============================================================================

--- packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff (original)
+++ packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff Tue Sep  8 22:42:14 2009
@@ -54,40 +54,40 @@
      # Generate error for unsupported JVM layout
  
      if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
-[1mdiff --git a/scilab/bin/scilab b/scilab/bin/scilab[m
-[1mindex 7efaf1a..3616712 100755[m
-[1m--- a/scilab/bin/scilab[m
-[1m+++ b/scilab/bin/scilab[m
-[36m@@ -328,13 +328,21 @@ case $OS in[m
- 				proc="amd64"[m
- 				;;[m
- 			i?86)[m
-[31m-[m
- 				if test -d ${JRE_HOME}/lib/`uname -m` ; then[m
- 					proc=`uname -m`[m
- 				else[m
- 					proc="i386"[m
- 				fi[m
- 				;;[m
-[32m+[m			[32m"mips"|"mipsel") # under mipsel, uname -m is[m
-[32m+[m					[32m# usually returning mips ...[m
-[32m+[m					[32m# but binary are in mipsel[m
-[32m+[m				[32mif test -d ${JRE_HOME}/lib/mipsel ; then[m
-[32m+[m					[32mproc="mipsel"[m
-[32m+[m				[32melse[m
-[32m+[m					[32mproc="mips"[m
-[32m+[m				[32mfi[m
-[32m+[m				[32m;;[m
- 			"ia64")[m
- 				proc="ia64"[m
- 				;;[m
-[36m@@ -347,6 +355,9 @@ case $OS in[m
- 			"s390"|"s390x")[m
- 				proc="s390"[m
- 				;;[m
-[32m+[m			[32m"armv4l"|"armv5tel")[m
-[32m+[m				[32mproc="arm"[m
-[32m+[m				[32m;;[m
- 			*)[m
- 				echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."[m
- 				echo "Fallback on the model <${MODEL}> found by uname -m"[m
+diff --git a/scilab/bin/scilab b/scilab/bin/scilab
+index 7efaf1a..3616712 100755
+--- a/scilab/bin/scilab
++++ b/scilab/bin/scilab
+@@ -328,13 +328,21 @@ case $OS in
+ 				proc="amd64"
+ 				;;
+ 			i?86)
+-
+ 				if test -d ${JRE_HOME}/lib/`uname -m` ; then
+ 					proc=`uname -m`
+ 				else
+ 					proc="i386"
+ 				fi
+ 				;;
++			"mips"|"mipsel") # under mipsel, uname -m is
++					# usually returning mips ...
++					# but binary are in mipsel
++				if test -d ${JRE_HOME}/lib/mipsel ; then
++					proc="mipsel"
++				else
++					proc="mips"
++				fi
++				;;
+ 			"ia64")
+ 				proc="ia64"
+ 				;;
+@@ -347,6 +355,9 @@ case $OS in
+ 			"s390"|"s390x")
+ 				proc="s390"
+ 				;;
++			"armv4l"|"armv5tel")
++				proc="arm"
++				;;
+ 			*)
+ 				echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 				echo "Fallback on the model <${MODEL}> found by uname -m"


