Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv26036
Modified Files:
octave-3.2.4.info
Log Message:
with fink's atlas, don't need -ff2c, validated on powerpc-darwin8
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/octave-3.2.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- octave-3.2.4.info 7 Sep 2011 18:42:47 -0000 1.2
+++ octave-3.2.4.info 11 Sep 2011 21:40:10 -0000 1.3
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.2.4)
Version: 3.2.4
-Revision: 11
+Revision: 12
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -85,22 +85,27 @@
darwin_vers=`uname -r | cut -d. -f1`
export CFLAGS='-g -O3 -MD'
export CXXFLAGS='-g -O3 -MD'
+ FFLAGS="-g -O3"
if test $darwin_vers = 8
- then export FFLAGS='-g -O3 -ff2c'
- else export FFLAGS='-g -O3'
+ then
+ if [ "%type_pkg[-atlas]" = "" ]
+ then FFLAGS="$FFLAGS -ff2c"
fi
+ # fink-built atlas doesn't use/need it
+ fi
+ export FFLAGS
export F77=gfortran-fsf-4.6
# auto-detect and use f90cache
- if test -x %p/bin/f90cache
- then
- export F90CACHE_DIR=%p/var/f90cache
- mkdir opt-bin
- { echo "#!/bin/sh" ; echo "exec $F77 \"\$@\"" ;} \
- > opt-bin/gfortran-4.6
- chmod +x opt-bin/gfortran-4.6
- export PATH=%b/opt-bin:$PATH
- export F77="f90cache gfortran-4.6"
- fi
+ #if test -x %p/bin/f90cache
+ #then
+ # export F90CACHE_DIR=%p/var/f90cache
+ # mkdir opt-bin
+ # { echo "#!/bin/sh" ; echo "exec $F77 \"\$@\"" ;} \
+ # > opt-bin/gfortran-4.6
+ # chmod +x opt-bin/gfortran-4.6
+ # export PATH=%b/opt-bin:$PATH
+ # export F77="f90cache gfortran-4.6"
+ #fi
if [ "%type_pkg[-atlas]" == "" ]
then
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
