diff options
| author | rafan <rafan@75cda91c-bdda-477a-9548-7b8f56199edc> | 2008-05-17 19:32:20 +0800 |
|---|---|---|
| committer | rafan <rafan@75cda91c-bdda-477a-9548-7b8f56199edc> | 2008-05-17 19:32:20 +0800 |
| commit | 52fd3b9be9e8fdea262f8928f97901677680b50b (patch) | |
| tree | 7a8d905482668483d3f0b88da346e0c09bcfbba1 | |
| parent | 13cecbdbfdf5653225e5ac0c557768186f2afc71 (diff) | |
| download | wslabports-52fd3b9be9e8fdea262f8928f97901677680b50b.tar.gz wslabports-52fd3b9be9e8fdea262f8928f97901677680b50b.tar.zst wslabports-52fd3b9be9e8fdea262f8928f97901677680b50b.zip | |
- Update for R2008a
- Some matlab.diff new patches [1]
- With 2.6 kernel emulation and f8 linux_base + jdk16, matlab now seems
working on amd64
Obtained from: Tz-Huan Huang <tzhuan@csie> [1]
git-svn-id: https://opensvn.csie.org/wslabports/trunk@23 75cda91c-bdda-477a-9548-7b8f56199edc
| -rw-r--r-- | matlab/Makefile | 4 | ||||
| -rwxr-xr-x | matlab/files/matlab | 7 | ||||
| -rw-r--r-- | matlab/files/matlab.diff | 31 |
3 files changed, 31 insertions, 11 deletions
diff --git a/matlab/Makefile b/matlab/Makefile index e1d2bee..94462d3 100644 --- a/matlab/Makefile +++ b/matlab/Makefile @@ -7,8 +7,8 @@ PORTNAME= matlab # set PORTVERSION equal to what matlab says -PORTVERSION= 7.5.0.338 # R2007b -PORTREVISION= 1 +PORTVERSION= 7.6.0.324 # R2008a +PORTREVISION= 0 CATEGORIES= local DISTFILES= diff --git a/matlab/files/matlab b/matlab/files/matlab index 4861393..9b7d424 100755 --- a/matlab/files/matlab +++ b/matlab/files/matlab @@ -4,13 +4,6 @@ ARCH=`uname -p` -if [ "${ARCH}" = "amd64" -a -z "${FORCE}" ]; then - echo "MATLAB can not run on amd64. To try it, run" - echo "" - echo "env FORCE=1 $0 " - exit 1 -fi - echo "" echo "!!! WARNING !!!" echo "" diff --git a/matlab/files/matlab.diff b/matlab/files/matlab.diff index d9225a9..3479871 100644 --- a/matlab/files/matlab.diff +++ b/matlab/files/matlab.diff @@ -1,12 +1,39 @@ --- bin/matlab.orig Sat Nov 5 10:32:26 2005 +++ bin/matlab Sat Nov 5 10:32:53 2005 -@@ -397,7 +397,8 @@ +@@ -397,7 +397,7 @@ # # Check for link portably # - if [ `expr "$lscmd" : '.*->.*'` -ne 0 ]; then -+# + if test -L $newbase; then filename=`echo "$lscmd" | awk '{ print $NF }'` else # +diff -ur matlab/bin/util/arch.sh matlab-freebsd/bin/util/arch.sh +--- bin/util/arch.sh 2008-05-16 22:13:20.510308026 +0800 ++++ bin/util/arch.sh 2008-05-16 22:14:00.720928347 +0800 +@@ -141,7 +141,10 @@ + ;; + esac + ;; +- esac ++ FreeBSD) ++ ARCH="glnx86" ++ ;; ++ esac + fi + return 0 + } +diff -ur matlab/bin/util/oscheck.sh matlab-freebsd/bin/util/oscheck.sh +--- bin/util/oscheck.sh 2008-05-16 22:13:20.510308026 +0800 ++++ bin/util/oscheck.sh 2008-05-16 22:14:00.715995303 +0800 +@@ -130,7 +130,8 @@ + # Example: Be sure that the platform has flag sse2 + # There are many ways to do this. + # Output the flag location. +- expr "`cat /proc/cpuinfo`" : '.* sse2 .*$' ++ #expr "`cat /proc/cpuinfo`" : '.* sse2 .*$' ++ echo 1 + return + ;; + *) |