Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv24322/10.7/stable/main/finkinfo/sci
Modified Files: octave-3.0.5.info Log Message: Build fixes Index: octave-3.0.5.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- octave-3.0.5.info 24 Jan 2012 14:52:40 -0000 1.34 +++ octave-3.0.5.info 24 Jan 2012 18:06:53 -0000 1.35 @@ -2,7 +2,7 @@ Package: octave%type_pkg[-atlas] Type: -atlas (boolean), oct(3.0.5), gcc (4.6) Version: 3.0.5 -Revision: 3007 +Revision: 3009 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net> Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.bz2 @@ -65,6 +65,11 @@ -e "s|%%OCTAVE_CONF_LD_CXX%%|\"oct-cxx\"|" \ -e "s|%%OCTAVE_CONF_SH_LD%%|\"oct-cxx\"|" \ src/oct-conf.h.in mkoctfile*in + # Add the BLAS C library for the -atlas variant. + if [ "%type_pkg[-atlas]" = "-atlas" ] + then sed -i.bak -e 's|%%OCTAVE_CONF_BLAS_LIBS%%|"-llapack -lf77blas -lcblas"|' \ + src/oct-conf.h.in mkoctfile.in + fi << SetCC: flag-sort -r gcc @@ -86,7 +91,7 @@ a='--with-lapack=-Wl,-framework,Accelerate --with-blas=-Wl,-framework,Accelerate' export FFLAGS='-O3 -ff2c' else - a='--with-lapack=-llapack --with-blas="-lf77blas -lcblas"' + a='--with-lapack=-llapack --with-blas=-lf77blas' export FFLAGS='-O3' fi FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib" @@ -125,9 +130,8 @@ sed -i.bak -e "s|flag-sort -r gcc|oct-cc|g" \ -e "s|flag-sort -r g++|oct-cxx|g" \ %i/bin/%{Ni}-bug-%v - # for the -atlas variant, add libcblas.dylib to BLAS_LIBS: - #perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1 %p/lib/libcblas.dylib|' \ - # %i/bin/%{ni}-bug-%v + # for the -atlas variant, add -lcblas to BLAS_LIBS: + perl -pi -e 's/(BLAS_LIBS.*)\"/\1 -lcblas\"/' %i/bin/%{ni}-bug-%v # move compiler wrapper over cp %b/oct-compiler.in %i/share/%{Ni}/%v/scripts ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs